This repository has been archived by the owner on Feb 10, 2022. It is now read-only.
forked from Baystation12/Baystation12
-
Notifications
You must be signed in to change notification settings - Fork 0
merging update 1 #1
Open
WonderPsycho
wants to merge
4,412
commits into
WonderPsycho:dev
Choose a base branch
from
Fox-McCloud:master
base: dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
4412 commits
Select commit
Hold shift + click to select a range
d7f7e03
Merge pull request #474 from Fox-McCloud/master
Fox-McCloud d4cc99f
Merge pull request #33 from ZomgPonies/master
Fox-McCloud d7b78d9
Revert "Merge From Master"
Fox-McCloud 184bc82
Merge pull request #34 from Fox-McCloud/revert-33-master
Fox-McCloud 156dbe4
Revert "Merge Conflict"
Fox-McCloud 846819f
Merge pull request #475 from ZomgPonies/revert-474-master
Fox-McCloud b5eab3c
Merge pull request #35 from ZomgPonies/master
Fox-McCloud 1fe3782
Merge pull request #476 from Fox-McCloud/master
Fox-McCloud c60f6b0
Merge pull request #36 from ZomgPonies/master
Fox-McCloud ff54c03
Revert "Merge Conflict Resolution?"
Fox-McCloud 1b9bd15
Merge pull request #477 from ZomgPonies/revert-476-master
Fox-McCloud 8436506
Merge pull request #478 from Fox-McCloud/master
Fox-McCloud 4e52e7f
Merge pull request #38 from ZomgPonies/master
Fox-McCloud 75325cb
Revert "FIX?!"
Fox-McCloud cd26b93
Merge pull request #39 from Fox-McCloud/revert-38-master
Fox-McCloud bf93e9c
Jetpacks for Sydnies!
Fox-McCloud 5ecd241
Merge pull request #479 from Fox-McCloud/Jetpack-Harness-Syndi
Fox-McCloud 7dcc3a3
Merge pull request #40 from ZomgPonies/master
Fox-McCloud 1494e97
Camera consistency fixes round two.
mvanalphen 722fd6a
Nukeops Update
S-CR bf867da
Merge pull request #469 from Nienhaus/master
Fox-McCloud 6dfc1f4
Merge pull request #482 from SamCroswell/master
Fox-McCloud 28c15dc
ESword Changes
S-CR 4ffd1a9
M1911P Fix
S-CR 7405ae3
Camera console network rework
mvanalphen 211023b
Syndicate Medibots, Energy Recharge Fix
S-CR 1d4b9c3
Switch Keycard Authentication Device to NanoUI
mvanalphen 54c9f99
Make the event text bold
mvanalphen cda487f
Armory Update
S-CR 37b1113
Merge pull request #483 from SamCroswell/master
Fox-McCloud 84fd782
Incorporate Dave's armory changes.
mvanalphen 138e15c
Updating to Dave's version once more
mvanalphen 40e7c46
And again
mvanalphen cbe6479
Merge pull request #1 from ZomgPonies/master
mvanalphen 2e0953a
And re-adding my changes.
mvanalphen e8cab89
Merge pull request #484 from Markolie/nanoui
Fox-McCloud a83632d
Merge pull request #41 from ZomgPonies/master
Fox-McCloud 46793a2
Poker table fix, two handed fix, Nukeops naming
S-CR 61b58ee
Merge pull request #485 from SamCroswell/master
Fox-McCloud bf65915
Merge pull request #42 from ZomgPonies/master
Fox-McCloud 111b24c
Janitor Rework
Fox-McCloud a1a7100
Oops
Fox-McCloud 03a9bba
Merge pull request #486 from Fox-McCloud/Janitorial-Stuffs
Fox-McCloud 7311f94
Update nuclear bomb's regular and hacking UI to NanoUI
mvanalphen be7634f
Loyalty implants for ERT
mvanalphen f38782e
Porting over fix for HTML injection exploit from /tg/
mvanalphen bdeb72c
Minor spacing fix
mvanalphen 72a9ff4
And cleaning up redundant definitions
mvanalphen 3944c7b
Upgraded Escape and Security Podbays
1e67cf2
Table Climbing Block Formatting Fixes
TheDZD 867a212
Merge pull request #487 from Markolie/nanoui
Fox-McCloud b5a0d26
Merge pull request #43 from ZomgPonies/master
Fox-McCloud be3e274
PDA Fix
Fox-McCloud 95db9eb
Merge pull request #489 from Fox-McCloud/PDA-Cart-Fix
Fox-McCloud 76b4970
Merge pull request #488 from fj45/master
Fox-McCloud a28a83b
Merge remote-tracking branch 'upstream/master'
TheDZD e3ee72b
Merge pull request #44 from ZomgPonies/master
Fox-McCloud f84ca26
Fixes and Stuff
Fox-McCloud 1f2728c
Merge pull request #492 from Fox-McCloud/Little-Fixes
Fox-McCloud eb039f8
Makes occupant scream while being gibbed.
nicky89107 ac3c730
Revert "Merge from Master"
Fox-McCloud 1f94e0b
Merge pull request #45 from Fox-McCloud/revert-44-master
Fox-McCloud 6bd1bea
Revert "Revert "Merge from Master""
Fox-McCloud ace7340
Merge pull request #46 from Fox-McCloud/revert-45-revert-44-master
Fox-McCloud a59a535
Esword update
S-CR 125d40d
Merge remote-tracking branch 'upstream/master'
TheDZD e8e3f76
Dual Eswords Now Deflect Shots
S-CR cada511
New Coffee Cup Sprite and New Canister
TheDZD 7c2b8c0
Add's a gibbing sound effect to the gibber. -Tigercat2000
nicky89107 6622d61
Stop, HAMMER TIME!
S-CR 7a888eb
Merge pull request #2 from ZomgPonies/master
mvanalphen 0cd3223
AI fixes, borg fixes, map fixes
mvanalphen e9ee057
Fix the incinerator doors, give atmos external airlock access so they…
mvanalphen fb34be5
Separate the Magistrate's Office from the IAA's Office
mvanalphen b2d0e26
Add meson goggles to atmos lockers, add alert camera monitors to engi…
mvanalphen 7b58347
Solitary area fix
mvanalphen 069cabe
Fixes runtime error when fire doors are closed, allows AI/borgs to ac…
mvanalphen fa8ecd6
Fix APC runtime error, open nuke interface when inserting disk
mvanalphen e49e9a8
Make sure Beepsky doesn't arrest the NT Rep for carrying his cane
mvanalphen d2d02e4
Syni Venors
S-CR cbe2bee
Crazy amount of map fixes.
mvanalphen 62b35e7
And some final map changes.
mvanalphen 86416d7
Admin Room/Syndi Shuttle update
S-CR 5cde6f2
Merge pull request #496 from Markolie/changes-2
Fox-McCloud b0963fa
Slime runtime error fixes, minor map fixes
mvanalphen c755294
Bulldog In-Hand Fix
S-CR 8c01445
Revert "Admin Room/Syndi Shuttle update - Merge Conflict Fix"
S-CR 5801818
Map Changes, Attempt #2
S-CR a2a4ace
Map Changes, Merge Conflict Fix? I hope?
S-CR 5a10b15
Revert "Map Changes, Merge Conflict Fix? I hope?"
S-CR 7395d73
Revert "Map Changes, Attempt #2"
S-CR 16b5102
Merge branch 'master' of https://www.github.com/ZomgPonies/Paradise
S-CR a0bc630
Update firedoor.dm
mvanalphen 3249c89
Merge pull request #499 from Markolie/master
Fox-McCloud b89e99c
Drag and Drop for Operating Table and Cryosleeper
TheDZD 0fd91f8
Merge remote-tracking branch 'upstream/master'
TheDZD 84bffd2
Space Helmets No Longer Fall Off
TheDZD 5143a58
Merge branch 'master' of https://github.com/ZomgPonies/Paradise
nicky89107 876a506
Adds constructable and upgradeable machinery, fixes the RPED, other m…
mvanalphen 2e315af
Fixing merge conflict
mvanalphen fd110d1
Fix merge conflict
mvanalphen 21e9989
Merge conflict fix
mvanalphen 508e7d2
Map merge fix attempt three
mvanalphen f1278b7
Merge pull request #1 from ZomgPonies/master
mvanalphen 82ffc0c
And committing the map changes
mvanalphen 82f30f5
Merge branch 'changes-1' of https://github.com/Markolie/Paradise into…
mvanalphen 2f7d3ae
Additional constructable and upgradeable machines, adds soap to drone…
mvanalphen 3e67587
Allows the freezer/heater to actually be connected, minor machine fix…
mvanalphen 4115c98
Glass instead of wood for bottles
mvanalphen 59edf27
Makes SMES'es and Vending Machines constructable and upgradeable, giv…
mvanalphen 7b522af
Light fix
mvanalphen d490c93
Capitalization fix
mvanalphen eda047c
Add default empty schema
mvanalphen 2ee5afe
Merge pull request #2 from ZomgPonies/master
mvanalphen dc89eab
Debugging
mvanalphen 119f3dd
Merge pull request #503 from Markolie/master
Fox-McCloud 8f47f50
Fix stun batons and holographic sign projectors
mvanalphen e2e996f
Glass now changes color when built based on the area, map fixes
mvanalphen dd37391
Properly document harmbatonning removal, window update check
mvanalphen c79cb69
Merge branch 'master' of https://github.com/ZomgPonies/Paradise
nicky89107 3777f5c
Revert debugging
mvanalphen 253c5a5
Final map fixes before merge
mvanalphen f925c56
Merge pull request #504 from Markolie/master
Fox-McCloud 16b5256
Merge pull request #500 from SamCroswell/master
Fox-McCloud d8f5684
Let AI state laws over specified channel, lets borgs state laws
mvanalphen 63cb529
See if this fixes the conflict
mvanalphen e344353
Merge pull request #4 from ZomgPonies/master
mvanalphen 03ef55c
And recommitting my changes
mvanalphen dc2efa6
Fixing merge conflict
mvanalphen c2ce8a6
Merge conflict
mvanalphen f432af7
Merge pull request #502 from Markolie/changes-1
Fox-McCloud 69cc235
Merge pull request #5 from ZomgPonies/master
mvanalphen 06b0a7a
Re-add Dave's changes, nerf remote view/remote talk
mvanalphen 91cbb3d
Merge pull request #506 from Markolie/master
Fox-McCloud 20357b4
Merge branch 'master' of https://www.github.com/ZomgPonies/Paradise
S-CR e9e3705
Minor map fixes, teleporter description fix
mvanalphen c44325c
Minor change
mvanalphen 7c2f2d0
Adds Duffelbag, Fixes Inhand for Hammers
S-CR 5eb9060
Merge branch 'master' of https://github.com/ZomgPonies/Paradise
nicky89107 421c461
Some more map fixes
mvanalphen 6595b8c
Fix cloning/telebaton
mvanalphen 067d956
Changes the button for admin OOC color to be descriptive of such. "OOC
nicky89107 9686812
Merge pull request #507 from Markolie/master
Fox-McCloud ef82aa2
Merge branch 'master' of https://github.com/ZomgPonies/Paradise
nicky89107 08016a9
Adds Machine-People specific *buzz *ping and *beep emotes.
nicky89107 b64a09e
Fix grilles
mvanalphen 5b3df5a
Fix names of scanning modules
mvanalphen 3d80608
Let protolathe's be loaded with chemicals again, let circuitprinter d…
mvanalphen 7415d1b
Add the decloner to R&D
mvanalphen afff269
Medbay quarantine fix
mvanalphen 1269fe7
Fix encryption key name
mvanalphen e023456
Remove the duplicate decloner
mvanalphen 24fcbb5
Autolathe fix
mvanalphen 229824a
Fix duplicate numbers in autolathe
mvanalphen 42dd08f
Variable typo fix, add proper Unati/Tajaran hardsuit conversion from …
mvanalphen 0f0829e
Merge remote-tracking branch 'upstream/master'
TheDZD f076d7c
Merge pull request #497 from TheDZD/master
Fox-McCloud 2c2c7fc
Constructable Phazon, constructable display case
mvanalphen 9bd63e8
Upping the research levels for the Phazon
mvanalphen 107325b
Melee attack for mechs
mvanalphen c0f1c92
Windoor damage fix, allows deconstruction of windoors
mvanalphen 222e26e
Merge pull request #508 from Markolie/master
Fox-McCloud 3a6a384
Fix fire alarm in engineering that gets EMP'ed
mvanalphen fd064b8
Teleporter can no longer lock on to syndicate beacons. Teleporter/bea…
mvanalphen bab7b3a
Broken alarm
mvanalphen ffdd025
Merge pull request #510 from Markolie/master
Fox-McCloud 90bb1c5
Weapon description update
S-CR b1c8116
Mjolnir Directional Fix
S-CR f43ae4a
Merge pull request #511 from SamCroswell/master
Fox-McCloud e9fc80f
Re-add harmbatonning. Adds forcesay: if you're typing when you get hi…
mvanalphen dd70ba2
Adds a psychiatrist's locker to the psychiatrist's locker, with a str…
mvanalphen 20419b6
Proper mapmerge
mvanalphen 2727a11
Merge pull request #512 from Markolie/master
Fox-McCloud 53cb777
Map Changes, Duffelbag Fix
S-CR c4e97f6
Synicate Medibot Access Fix
S-CR a38e0d7
Merge pull request #513 from SamCroswell/master
Fox-McCloud 99c7c4b
Merge pull request #493 from nicky89107/master
Fox-McCloud c0e7c12
Inhand Edits
S-CR ceabc46
Dismemberment Update, Fire Axe Fixes, Gun Sounds
S-CR 30c1960
Adds Syndiborg to NukeOps, enables shortcuts for borgs/drones, notifi…
mvanalphen 74e72cd
Add hud icons for various jobs
mvanalphen 269253d
SyndiBorg flash removed, CentCom access update
mvanalphen 2f25e4f
Merge pull request #515 from Markolie/master
Fox-McCloud 7e1a926
Missing hud icons
mvanalphen e617ab8
Merge pull request #516 from Markolie/master
Fox-McCloud a7c63e4
Botany Mutation Rework
FalseIncarnate 519c224
Merge pull request #517 from FalseIncarnate/master
Fox-McCloud 8e44118
Add confirmation to Syndiborg
mvanalphen d4891b3
Change default value for Syndiborg
mvanalphen 3396aaf
Update antag_spawner.dm
mvanalphen 70f8046
Update uplinks.dm
mvanalphen 86838ea
Merge pull request #518 from Markolie/master
Fox-McCloud 3a9d45c
Adds podbay doors to the pods that can be opened using the button, or…
mvanalphen 0f98d78
Merge branch 'master' of https://github.com/Markolie/Paradise
mvanalphen 70ee0cf
Dismemberment, Part 2: Explosive Act
S-CR 2d36851
Syndicate hardsuit helmet fix, SyndiBorg PDA fix
mvanalphen 549cf1f
Merge pull request #520 from Markolie/master
Fox-McCloud 16b780c
Make sure alt titles have HUD icons
mvanalphen 24376f5
HUD icon for Psychologist
mvanalphen 72196cd
Merge pull request #119 from ZomgPonies/master
melandor0 b41026c
Merge pull request #514 from SamCroswell/master
Fox-McCloud c6c089d
Merge pull request #521 from Markolie/master
Fox-McCloud 2f7dafd
Sparkyninja's beret
melandor0 6dec83b
-SM drill
melandor0 fb4d40f
Merge pull request #466 from melandor0/paradise
Fox-McCloud 759b6b6
Re-add the Singuloth Knight's hardsuit.
mvanalphen 3c521b0
Fix pod door button descriptions.
mvanalphen 338de0e
Minor fixes
mvanalphen 1bd2523
And another fix
mvanalphen e4c3cef
Fix security checkpoint window colors
mvanalphen b663a01
Slime Icons
TheDZD 8bb5ca8
Merge remote-tracking branch 'upstream/master' into Slime-Fix
TheDZD ec98c30
Missing Slime Reactions
TheDZD bf906c1
Merge pull request #523 from TheDZD/Slime-Fix
Fox-McCloud 484c10d
Merge pull request #522 from Markolie/master
Fox-McCloud c7b5a20
Merge pull request #47 from ZomgPonies/master
Fox-McCloud 3be1a25
Bug fixes, wording changes
mvanalphen 13f0cc1
Remove debugging
mvanalphen 202019b
Shift-clicking as AI's/borgs now examines
mvanalphen 8ef2d4d
Description fix
mvanalphen d955208
Merge pull request #525 from Markolie/master
Fox-McCloud 0ce4086
Merge pull request #48 from ZomgPonies/master
Fox-McCloud 261157c
AI, PDA, and Other changes
Fox-McCloud 8ccf6d1
Merge pull request #526 from Fox-McCloud/AI-PDA-Reagents-Etc
Fox-McCloud 7554748
Adds Mortician, vomit mask fix, fix for missing images for various jobs
mvanalphen 7e9f669
Merge pull request #527 from Markolie/master
Fox-McCloud 7e02544
Removes debugging broadcast from force-say.
nicky89107 bfcbb5f
Merge branch 'master' of https://github.com/ZomgPonies/Paradise
nicky89107 23b4dca
Merge pull request #528 from nicky89107/master
Fox-McCloud 7dd1420
Makes NT Representative/Recruiter Karma locked again, SyndiBorg modty…
mvanalphen f7c0acb
Merge pull request #529 from Markolie/master
Fox-McCloud 6cfea53
The Mortician's labcoat can now be (un)buttoned
mvanalphen 8b16d39
Projectile Laser Update
S-CR 194711f
Merge pull request #530 from Markolie/master
Fox-McCloud 2700681
Merge pull request #531 from SamCroswell/master
Fox-McCloud 5d6abde
Deathsquad Cyborgs
S-CR 672cf36
CentComm Borg Access Fix
S-CR c9b6d71
Merge pull request #532 from SamCroswell/master
Fox-McCloud b66f3ef
Bug fixes, implements new copying/faxing system from Bay
mvanalphen da0f915
Fix cyborg zippo's
mvanalphen e6cf333
Lets not forget debugging again
mvanalphen 3b1dc8e
Merge branch 'master' of https://github.com/ZomgPonies/Paradise
mvanalphen bb676c0
And re-add the fax machine update
mvanalphen 7e606eb
And a map fix
mvanalphen 87fb604
Fix Supermatter message spam
mvanalphen a34d283
Cloning and deathsquad fixes
mvanalphen f62cb59
Default stunbaton back to 1500
mvanalphen df5d569
Minor borg fix
mvanalphen 08b703c
Merge pull request #533 from Markolie/master
Fox-McCloud 686262b
Merge pull request #49 from ZomgPonies/master
Fox-McCloud File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
The diff you're trying to view is too large. We only load the first 3000 changed files.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,3 +8,9 @@ | |
| #ignore any files in config/, except those in subdirectories. | ||
| /config/* | ||
| !/config/*/* | ||
|
|
||
| #ignore other, specific files and folers | ||
| data/ | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. new stuff |
||
| maps/backup/* | ||
| maps/cyberiad.dmm.backup | ||
| nano/debug.html | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
1