Commit Graph

1354 Commits

Author SHA1 Message Date
kevinz000 6dc6159f4a Merge pull request #9578 from deathride58/mapsubsystemimprovements
Map config system improvements - Fixed and expanded map vote restrictions, map-specific announcer framework, and more
2019-10-29 21:42:32 -07:00
Ghommie f725afae64 Random plush spawner tweaks and fixes. 2019-10-29 02:06:22 +01:00
kevinz000 48105c5a5f Merge pull request #9630 from Ghommie/Ghommie-cit280
little camera console fix.
2019-10-27 16:11:58 -07:00
kevinz000 dfd06225d3 Merge pull request #9617 from JTGSZ/ghomfix
Barricade girder walls no longer runtime each tick.
2019-10-27 16:11:35 -07:00
kevinz000 19729ee706 Merge pull request #9623 from Ghommie/Ghommie-cit276
Ports "New Teleporter Station sprites." and "Add teleport station calibration animation."
2019-10-27 16:09:20 -07:00
Ghommie 9608b437b4 I need to fix the camera bug later... thing has been borked for one year. 2019-10-27 12:18:49 +01:00
Ghommie 29777f25e5 stop cyborg from interacting with objects out of their FoV, lil camera console fix 2019-10-27 11:55:11 +01:00
Ghommie 5bccde6e70 Ports "New Teleporter Station sprites." and "Add teleport station calibration animation." 2019-10-26 15:25:26 +02:00
JTGSZ f97e244cc9 Update deployable.dm 2019-10-25 21:23:52 -04:00
kevinz000 7beb00abba Merge pull request #9593 from Ghommie/Ghommie-cit263
Fixing gulag teleporter stripping the user of stuff it really shouldn't.
2019-10-24 19:10:17 -07:00
Ghommie a50606bb67 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit259 2019-10-24 10:10:07 +02:00
deathride58 f85f110baa Merge pull request #9047 from Poojawa/syntheticbloods
RGB Blood Reworks + Blood generator
2019-10-23 20:54:55 -04:00
Ghommie 452658b16c Code improvement. 2019-10-23 21:26:43 +02:00
Ghommie 0e6033a576 Fixing gulag teleporter stripping the user of stuff it really shouldn't. 2019-10-23 21:21:05 +02:00
Ghommie e1928a18f1 Porting GetComponent macros removal, and some related changes. 2019-10-23 15:04:28 +02:00
deathride58 68813b6846 Map config improvements - Adds more variables for the map voting system to take into account, allows far greater flexibility for mappers, adds a random chance for the medibot voice to be the station announcer 2019-10-22 19:14:12 -04:00
kevinz000 b9c96715b4 Merge pull request #9551 from Ghommie/Ghommie-cit254
Fixes recycler deleting all clothing for mobs found inside items (e.g bluespace bodybags)
2019-10-22 02:28:56 -07:00
Poojawa 7463bbc001 Merge branch 'master' into syntheticbloods 2019-10-21 21:06:18 -05:00
deathride58 2742c86723 Merge pull request #9072 from Poojawa/gen-poppers
Genpop for security
2019-10-21 21:15:01 -04:00
Poojawa 6fc750dca0 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-21 19:13:19 -05:00
kevinz000 4a28b7ea2d Merge pull request #9547 from Ghommie/Ghommie-cit250
Fixes silicons being unable to use the teleporter and records consoles from a distance
2019-10-21 01:07:27 -07:00
kevinz000 838575da50 Merge pull request #9503 from deathride58/tasernerf
Taser rework - Gives electrodes a debilitating status effect, makes disabler the default taser mode, and more
2019-10-21 00:59:58 -07:00
Ghommie ef35aefe4e Fixes recycler deleting all clothing for mobs found inside items (e.g. bluespace bodybags) 2019-10-20 15:41:48 +02:00
Ghommie 12192de0cd also records consoles. 2019-10-20 10:14:50 +02:00
Ghommie bcd6902f06 Fixes silicons being unable to use the teleporter console from a distance. 2019-10-20 10:08:58 +02:00
Poojawa ffeae20daa Merge remote-tracking branch 'Citadel-Station-13/master' into syntheticbloods 2019-10-18 06:01:52 -05:00
kevinz000 1cc4ccee0d Merge pull request #9343 from Linzolle/dissection
port just like a ton of surgery changes from tg also abductor too
2019-10-17 13:13:51 -07:00
Poojawa 4ee608e0c7 Fixes blood transfusion, QOL to IV drippers 2019-10-16 09:15:04 -05:00
Poojawa 184e81eec0 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-16 01:51:51 -05:00
Ghommie e8b777f162 typo fixes 2019-10-16 05:10:44 +02:00
Ghommie 80ba44e5a2 Smells like work in progress 2019-10-15 22:03:38 +02:00
Ghommie 32013f2aeb More whacky situations. 2019-10-15 21:59:27 +02:00
Ghommie 839f324c99 I need a code quality test. 2019-10-15 21:39:13 +02:00
Ghommie 7e3a812460 Fixing tracking implant teleport issues. 2019-10-15 21:32:01 +02:00
deathride58 50c27df28f Taser rework - Gives electrodes a debilitating status effect, makes disabler the default taser mode, and more 2019-10-15 03:48:44 -04:00
Ghommie 321c30cf89 now with 51% more loads. 2019-10-14 06:24:54 +02:00
Ghommie 3671755142 My cat resting on my neck is just sooo warm, like a best scarf. 2019-10-14 06:06:25 +02:00
Poojawa bcb11a471d Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-13 19:14:16 -05:00
kevinz000 53858e1818 Merge pull request #9416 from Ghommie/Ghommie-cit215
The niche singularity beacon now also moderately buffs meteor waves.
2019-10-13 13:56:03 -07:00
Ghommie 7b65343f45 z-level checks. 2019-10-13 06:04:57 +02:00
Poojawa 394c947d14 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-11 23:10:45 -05:00
Linzolle b50804dfc3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dissection 2019-10-11 20:06:26 -05:00
kevinz000 bcc92d234b Merge pull request #9386 from Sishen1542/suitrad
Gives suit storage units the ability to remove radiation from mobs
2019-10-11 12:13:04 -07:00
kevinz000 89747a3a6e Merge pull request #9368 from Seris02/master
Fixes luminescent dark blue major effect and changes the "autoprocess" button to "autoclone"
2019-10-10 02:18:25 -07:00
kevinz000 f686ea75d3 Merge pull request #8615 from Ghommie/Ghommie-cit45
Virtual reality componentization.
2019-10-10 02:09:51 -07:00
kevinz000 0c9a065096 Merge pull request #8401 from Ghommie/Ghommie-cit11
Refactoring Implants' loc n°3
2019-10-10 02:09:37 -07:00
Ghommie 735755019e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45 2019-10-09 01:18:30 +02:00
Ghommie 9ee1987dec Applying kevinz' ominous warning suggestion 2019-10-08 20:04:08 +02:00
Poojawa 3113074bfb Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-08 02:55:32 -05:00
kevinz000 143e8c4186 Merge pull request #9404 from Poojawa/qm-is-a-head
QM is a head of staff, Cargo ID Console added
2019-10-08 00:34:07 -07:00