Commit Graph

15461 Commits

Author SHA1 Message Date
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 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 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
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
CitadelStationBot 64bb4ea0c7 Removes a sound 2018-04-06 00:43:56 -05:00
Jordan Brown 7cddf61b94 Merge pull request #36975 from KorPhaeron/sound2
Removes a sound
2018-04-06 00:43:56 -05:00
CitadelStationBot 8eaf011e82 fixes cows moving while tipped 2018-04-06 00:43:38 -05:00
Jordan Brown 66dabf4ff7 Merge pull request #36976 from Iamgoofball/patch-422
fixes cows moving while tipped
2018-04-06 00:43:38 -05:00
LetterJay 49fd917fee Merge pull request #6252 from Citadel-Station-13/kevinz000-patch-4
looc now obeys ooc bans
2018-04-05 07:35:43 -05:00
deathride58 a275a787c1 Merge pull request #6224 from Citadel-Station-13/upstream-merge-36815
[MIRROR] Refactors Dance Machine + deletes a bunch of sound files
2018-04-05 00:17:27 +00:00
deathride58 f780b4dc99 Merge pull request #6272 from Citadel-Station-13/kevinz000-patch-1
Readds handholding
2018-04-05 00:03:59 +00:00
kevinz000 3d26bf4355 Worse than ERP 2018-04-04 14:27:50 -07:00
kevinz000 f94ff21968 readds handholding 2018-04-04 14:24:57 -07:00
deathride58 f4ebb8d2e9 Merge pull request #6228 from Citadel-Station-13/kevinz000-patch-1
Nerfs beam rifle effectiveness vs blob
2018-04-04 21:20:12 +00:00
deathride58 4636817ab5 Update packs.dm 2018-04-04 17:18:36 -04:00
deathride58 a8a7754b22 Merge pull request #6256 from Citadel-Station-13/upstream-merge-36598
[MIRROR] Fixes bloodbath effects not working on people in crit
2018-04-04 21:16:21 +00:00
deathride58 5f215ff2b4 Merge pull request #6257 from Citadel-Station-13/upstream-merge-36733
[MIRROR] podpeople, wishgranter victims, and clones no longer get 0 as one of their affixes (?)
2018-04-04 21:15:55 +00:00
deathride58 63ed2b0069 Merge pull request #6259 from Citadel-Station-13/upstream-merge-36711
[MIRROR] Fixed sometimes using items on full storage items
2018-04-04 21:14:13 +00:00
deathride58 c702e9b097 Merge pull request #6260 from Citadel-Station-13/upstream-merge-36927
[MIRROR] Adds more moth names to prevent duplicate random names
2018-04-04 21:13:23 +00:00
deathride58 8ad42c519a Merge pull request #6261 from Citadel-Station-13/upstream-merge-36928
[MIRROR] Removes @
2018-04-04 21:12:45 +00:00
deathride58 ef7b79eea7 Merge pull request #6262 from Citadel-Station-13/upstream-merge-36945
[MIRROR] Removes april fools from heirlooms
2018-04-04 21:12:26 +00:00
deathride58 af8862bd78 Merge pull request #6263 from Citadel-Station-13/upstream-merge-36867
[MIRROR] Fixes 0 value not being saved in constant memory circuits
2018-04-04 21:11:44 +00:00