Commit Graph

15485 Commits

Author SHA1 Message Date
kevinz000
83f1332229 >wiped my flavortext accidently 2018-04-08 19:39:06 -07:00
deathride58
120457d8fd Merge pull request #6088 from Citadel-Station-13/FixesItAll
Makes sure the server can never ever crash ever again
2018-04-08 04:18:37 +00:00
deathride58
ed2de4a61e Merge pull request #6115 from Poojawa/metabreaking
Metabreaks event reports
2018-04-08 04:17:35 +00:00
deathride58
8abcb08d9e Merge pull request #6249 from Citadel-Station-13/kevinz000-patch-3
meme update
2018-04-08 04:17:06 +00:00
CitadelStationBot
43baad50f1 [MIRROR] Add on-map sprites for pre-enabled atmos pumps (#6300)
* Add on-map sprites for pre-enabled atmos pumps

* Update volume_pump.dm

* Update pump.dm
2018-04-07 22:38:32 -05:00
Poojawa
a491e364c3 Adjust permissions for Admin Observers (#6247)
* adjusts permissions for the new political officer

* Update admin_verbs.dm

* adds +ADMIN checks to ahelp replies

* Update admin_verbs.dm
2018-04-07 22:33:42 -05:00
deathride58
832939d3ac Merge pull request #6282 from Citadel-Station-13/upstream-merge-36989
[MIRROR] Logs the load away mission verb.
2018-04-08 02:25:25 +00:00
deathride58
1d1c0a5ebb Merge pull request #6284 from Citadel-Station-13/upstream-merge-36560
[MIRROR] [READY]AI latejoins
2018-04-08 02:25:10 +00:00
deathride58
cf134192cc Merge pull request #6302 from Citadel-Station-13/upstream-merge-36871
[MIRROR] Shuttle garbage collection
2018-04-08 02:24:54 +00:00
deathride58
c4c7ac7a3e Merge pull request #6301 from Citadel-Station-13/upstream-merge-36980
[MIRROR] Prevents direct Del() calls
2018-04-08 02:24:37 +00:00
deathride58
ba16f570fc Merge pull request #6299 from Citadel-Station-13/upstream-merge-37015
[MIRROR] Fixes cow tipping properly
2018-04-08 02:23:27 +00:00
CitadelStationBot
0a2e657df4 Shuttle garbage collection 2018-04-07 19:50:27 -05:00
kevinz000
e8561ec98c Shuttle garbage collection (#36871)
* Shuttle garbage collection

* istype
2018-04-07 19:50:27 -05:00
CitadelStationBot
38cd356db0 Prevents direct Del() calls 2018-04-07 19:47:13 -05:00
vuonojenmustaturska
6ed0eee3f6 Merge pull request #36980 from tgstation/Cyberboss-patch-1
Prevents direct Del() calls
2018-04-07 19:47:13 -05:00
CitadelStationBot
d481a5ae29 Fixes cow tipping properly 2018-04-07 18:15:01 -05:00
AnturK
3de992aee2 Fixes cow tipping properly (#37015) 2018-04-07 18:15:00 -05:00
CitadelStationBot
4817cb10de cl 2018-04-07 13:44:03 -04:00
deathride58
a3f9995f0f Merge pull request #6280 from Citadel-Station-13/upstream-merge-36976
[MIRROR] fixes cows moving while tipped
2018-04-07 00:54:52 +00:00
deathride58
71344ce953 Merge pull request #6281 from Citadel-Station-13/upstream-merge-36975
[MIRROR] Removes a sound
2018-04-07 00:54:31 +00:00
deathride58
57f0cc35b5 Update mapping.dm 2018-04-06 20:54:12 -04:00
deathride58
b88da782aa Update job.dm 2018-04-06 20:53:15 -04:00
deathride58
4739836bd9 Merge pull request #6283 from Citadel-Station-13/upstream-merge-36994
[MIRROR] Fixes window spawner names
2018-04-07 00:51:12 +00:00
deathride58
b53b81455a Merge pull request #6285 from Citadel-Station-13/upstream-merge-36961
[MIRROR] Fixes mixed blood samples to preserve cloneable if the samples are the same
2018-04-07 00:50:56 +00:00
deathride58
d79d4ae3f1 Merge pull request #6286 from Citadel-Station-13/upstream-merge-36973
[MIRROR] Fixes null reference not pulsing the 'not scanned' output
2018-04-07 00:50:40 +00:00
deathride58
863ca69d3f Merge pull request #6288 from Citadel-Station-13/upstream-merge-36920
[MIRROR] READY flash fixes
2018-04-07 00:50:23 +00:00
deathride58
36c9094155 Merge pull request #6289 from Citadel-Station-13/upstream-merge-36956
[MIRROR] Fixes trash bin wrenching message
2018-04-07 00:49:53 +00:00
deathride58
bae5e5c81d Merge pull request #6291 from Citadel-Station-13/upstream-merge-36997
[MIRROR] Fixes dead chat announcements not using real name.
2018-04-07 00:49:33 +00:00
deathride58
df879ce1ca Merge pull request #6292 from Citadel-Station-13/upstream-merge-36872
[MIRROR] GC debugging features
2018-04-07 00:48:47 +00:00
deathride58
475fba9bd9 Merge pull request #6294 from Citadel-Station-13/upstream-merge-36627
[MIRROR]  fixes #34388 by adding cam
2018-04-07 00:46:51 +00:00
deathride58
756ca1ff17 Merge pull request #6295 from Citadel-Station-13/upstream-merge-36999
[MIRROR] Adds kickback to mecha weapons.
2018-04-07 00:46:33 +00:00
CitadelStationBot
2257247fe3 Adds kickback to mecha weapons. 2018-04-06 14:43:11 -05:00
AnturK
45a8c65739 Adds kickback to mecha weapons. (#36999) 2018-04-06 14:43:11 -05:00
CitadelStationBot
419bab7551 fixes #34388 by adding cam 2018-04-06 09:24:47 -05:00
Tlaltecuhtli
4f7d35ec4f fixes #34388 by adding cam (#36627)
* wip fixes #34388

🆑 
fix:stuff
🆑

* vv

* ASDASD

* daikshu

* wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww

* wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww

* 99999999999999999999999999999

* *tabs*

* Update comp_board_designs.dm
2018-04-06 09:24:47 -05:00
CitadelStationBot
682f584eed GC debugging features 2018-04-06 09:17:11 -05:00
Jordan Brown
0ddf202682 Merge pull request #36872 from kevinz000/totally_not_a_feature
GC debugging features
2018-04-06 09:17:11 -05:00
CitadelStationBot
6c1ae38ab7 Fixes dead chat announcements not using real name. 2018-04-06 09:08:48 -05:00
Jordan Brown
554ed22603 Merge pull request #36997 from DaxDupont/is-this-real-life
Fixes dead chat announcements not using real name.
2018-04-06 09:08:48 -05:00
CitadelStationBot
36571bc560 Fixes trash bin wrenching message 2018-04-06 09:07:20 -05:00
Jordan Brown
4dbd06b9a2 Merge pull request #36956 from vuonojenmustaturska/anchorbin
Fixes trash bin wrenching message
2018-04-06 09:07:20 -05:00
CitadelStationBot
846e040057 READY flash fixes 2018-04-06 04:05:19 -05:00
PKPenguin321
41b90f01e2 READY flash fixes (#36920)
* flash fixes

* switches to get_turf

* fixes the fix

* parent call and comment

added the comment so it doesnt get removed again by accident
2018-04-06 04:05:19 -05:00
CitadelStationBot
d053d2c828 Fixes null reference not pulsing the 'not scanned' output 2018-04-06 03:44:32 -05:00
robbym
a4e5a1d02c Fixes null reference not pulsing the 'not scanned' output (#36973) 2018-04-06 03:44:32 -05:00
CitadelStationBot
3c7852ed62 Fixes mixed blood samples to preserve cloneable if the samples are the same 2018-04-06 01:54:16 -05:00
SailorDave
107ccfda10 Tweaks mixed blood samples to preserve cloneable if the samples are the same (#36961) 2018-04-06 01:54:15 -05:00
kevinz000
38ae8beefc [READY]AI latejoins 2018-04-06 00:44:31 -05:00
CitadelStationBot
ac38cb893e Fixes window spawner names 2018-04-06 00:44:16 -05:00
vuonojenmustaturska
aaf3bb66cf Merge pull request #36994 from 81Denton/window-spawner-names
Fixes window spawner names
2018-04-06 00:44:16 -05:00