Commit Graph

3577 Commits

Author SHA1 Message Date
LetterJay e10760e1a5 Merge pull request #1963 from Citadel-Station-13/upstream-merge-29143
[MIRROR] Fixes race condition with admin proc calls and load admins
2017-07-09 23:06:47 -05:00
LetterJay b4eee0a1c4 Merge pull request #1962 from Citadel-Station-13/upstream-merge-29145
[MIRROR] Updates vending refill packs to reflect additional items added in headphones PR
2017-07-09 23:06:28 -05:00
LetterJay ff0c889a29 Merge pull request #1961 from Citadel-Station-13/upstream-merge-29140
[MIRROR] Removes now-unnecessary obj_integrity definitions
2017-07-09 23:06:13 -05:00
CitadelStationBot 5f54d006da Automatic changelog generation for PR #1960 [ci skip] 2017-07-09 23:05:55 -05:00
LetterJay 08e044a522 Merge pull request #1960 from Citadel-Station-13/upstream-merge-29141
[MIRROR] Necropolis curse mobs no longer fall into chasms
2017-07-09 23:05:53 -05:00
CitadelStationBot f387156a1d Automatic changelog generation for PR #1959 [ci skip] 2017-07-09 23:05:43 -05:00
LetterJay 19f805acc3 Merge pull request #1959 from Citadel-Station-13/upstream-merge-29134
[MIRROR] Allows drones to switch to/from harm intent
2017-07-09 23:05:42 -05:00
CitadelStationBot 27a6976dcb Automatic changelog generation for PR #1958 [ci skip] 2017-07-09 23:05:21 -05:00
LetterJay 41710ab525 Merge pull request #1958 from Citadel-Station-13/upstream-merge-29142
[MIRROR] Adds a crew monitoring console to the warden's office in BoxStation
2017-07-09 23:05:20 -05:00
LetterJay 2a0e31f0f2 Merge pull request #1955 from Citadel-Station-13/upstream-merge-29136
[MIRROR] Fixes flashbangs stunning for a maximum of 0.3 seconds instead of 6 seconds
2017-07-09 23:04:45 -05:00
LetterJay 5aa2fe3666 Merge pull request #1954 from Citadel-Station-13/upstream-merge-29127
[MIRROR] Fixes entire stacks of goliath plates being used on mechs
2017-07-09 23:04:17 -05:00
LetterJay ebfafc2426 Merge pull request #1953 from Citadel-Station-13/upstream-merge-29139
[MIRROR] Makes medipens unable to be emptied and then filled with toxins for a hardsuit-piercing OHKO weapon that has the disguise of medical aid
2017-07-09 23:04:05 -05:00
LetterJay 0e81a33e95 Merge pull request #1946 from Citadel-Station-13/upstream-merge-29106
[MIRROR] Chasm code cleanup
2017-07-09 23:03:31 -05:00
CitadelStationBot 060c7b9dec Fixes race condition with admin proc calls and load admins 2017-07-09 19:49:00 -05:00
CitadelStationBot d64469ccda Updates vending refill packs to reflect additional items added in headphones PR 2017-07-09 19:45:53 -05:00
CitadelStationBot 90c2a4f867 Removes now-unnecessary obj_integrity definitions 2017-07-09 19:44:48 -05:00
CitadelStationBot b24f98c1e2 Necropolis curse mobs no longer fall into chasms 2017-07-09 19:44:43 -05:00
CitadelStationBot 0f6ff169aa Allows drones to switch to/from harm intent 2017-07-09 19:44:40 -05:00
CitadelStationBot 292bed59f0 Adds a crew monitoring console to the warden's office in BoxStation 2017-07-09 19:43:35 -05:00
LetterJay 6e646c44cf Merge pull request #1957 from Citadel-Station-13/upstream-merge-29125
[MIRROR] Fixes wrapping objects
2017-07-09 15:51:49 -05:00
CitadelStationBot b770348797 Fixes wrapping objects 2017-07-09 10:14:16 -05:00
CitadelStationBot 5a11f53535 Fixes flashbangs stunning for a maximum of 0.3 seconds instead of 6 seconds 2017-07-09 06:44:49 -05:00
CitadelStationBot 9d85345b6d Fixes entire stacks of goliath plates being used on mechs 2017-07-09 06:44:46 -05:00
CitadelStationBot 08eaad468a Makes medipens unable to be emptied and then filled with toxins for a hardsuit-piercing OHKO weapon that has the disguise of medical aid 2017-07-09 06:43:42 -05:00
CitadelStationBot 0d84901914 Automatic changelog generation for PR #1943 [ci skip] 2017-07-08 23:50:52 -05:00
CitadelStationBot 4133d62161 [MIRROR] New portable generator icons (#1943)
* New portable generator icons

* Delete port_gen.dm.rej

* Update port_gen.dm
2017-07-08 21:50:51 -07:00
CitadelStationBot dfe371630b Automatic changelog generation for PR #1948 [ci skip] 2017-07-08 14:33:42 -05:00
LetterJay c5c66777ab Merge pull request #1948 from Citadel-Station-13/upstream-merge-29114
[MIRROR] Fixes plasma glass merging with normal glass
2017-07-08 14:33:41 -05:00
CitadelStationBot 0ec07c9fda Automatic changelog generation for PR #1945 [ci skip] 2017-07-08 14:33:21 -05:00
LetterJay 73adaf35a9 Merge pull request #1945 from Citadel-Station-13/upstream-merge-29112
[MIRROR] Reinforced Plasma Glass is more SME-worthy
2017-07-08 14:33:20 -05:00
CitadelStationBot aa790403a5 Automatic changelog generation for PR #1947 [ci skip] 2017-07-08 14:33:08 -05:00
LetterJay 73016577ca Merge pull request #1947 from Citadel-Station-13/upstream-merge-29111
[MIRROR] Box Viro Wants Plasma v2
2017-07-08 14:33:05 -05:00
CitadelStationBot c87c6f7053 Automatic changelog generation for PR #1950 [ci skip] 2017-07-08 14:32:52 -05:00
LetterJay bef2941681 Merge pull request #1950 from Citadel-Station-13/upstream-merge-29123
[MIRROR] Refactors catching to use attack_hand
2017-07-08 14:32:51 -05:00
LetterJay 26fbf67846 Merge pull request #1951 from Citadel-Station-13/upstream-merge-29120
[MIRROR] Fixes repeated adminhelp message
2017-07-08 14:32:39 -05:00
CitadelStationBot d608741385 Fixes repeated adminhelp message 2017-07-08 13:19:07 -05:00
CitadelStationBot 2d4604c94b Refactors catching to use attack_hand 2017-07-08 13:19:02 -05:00
CitadelStationBot 2d84e09851 Fixes plasma glass merging with normal glass 2017-07-08 09:45:46 -05:00
CitadelStationBot acb20fcde2 Box Viro Wants Plasma v2 2017-07-08 09:45:42 -05:00
CitadelStationBot 220a844f4b Chasm code cleanup 2017-07-08 09:44:37 -05:00
CitadelStationBot 7dd32c4ad9 Reinforced Plasma Glass is more SME-worthy 2017-07-08 09:44:34 -05:00
CitadelStationBot 2e4624ee3f Make timer debug info more robust (#1942) 2017-07-07 23:49:10 -07:00
CitadelStationBot ae544bff64 Automatic changelog generation for PR #1940 [ci skip] 2017-07-08 01:48:50 -05:00
CitadelStationBot 9874978c5c Dreams while sleeping are now slightly longer on average and will contain more possibilities (#1940) 2017-07-07 23:48:49 -07:00
CitadelStationBot a85476ec78 Corrected misplaced vents on Delta (#1939) 2017-07-07 23:48:37 -07:00
TalkingCactus 44206f3bf7 Update suicide.dm
just close the game
2017-07-07 18:50:13 -04:00
TalkingCactus cb5247d060 Fixes Gamemode Voting & Map Edits (#1937)
* fixes roundtype voting

* keg spawner

* maint bar to box and kinkmates to delta+meta
2017-07-07 17:54:53 -04:00
LetterJay ff15495f18 Merge pull request #1936 from Citadel-Station-13/upstream-merge-29093
[MIRROR] Request only the round ID in the issue template
2017-07-07 15:18:02 -05:00
CitadelStationBot f44b3cd279 Automatic changelog generation for PR #1935 [ci skip] 2017-07-07 15:17:47 -05:00
LetterJay 29ef7a9338 Merge pull request #1935 from Citadel-Station-13/upstream-merge-29046
[MIRROR] Adding the mook/wanderer mob for planetstation
2017-07-07 15:17:45 -05:00