Commit Graph

24273 Commits

Author SHA1 Message Date
Fermi cd47412db2 Merge branch 'master' into Spookytime 2019-10-11 19:10:48 +01:00
Fermi bfd97a82ca Eh 4 mins. 2019-10-11 18:56:33 +01:00
Fermi 489e711b4f pls 2019-10-11 18:49:30 +01:00
Fermi 8f6c988536 Explod 2019-10-11 18:17:43 +01:00
Fermi 8e71a20528 Oops 2019-10-11 18:16:25 +01:00
Fermi ae46b2932e Bath is ready to go. 2019-10-11 18:15:46 +01:00
Fermi 3009f8b2cc Meow 2019-10-11 17:56:24 +01:00
Fermi d21f7f9a9b Jacq fix 2019-10-11 15:26:39 +01:00
Fermi 349b5f4369 GRUMBLING INTENSIFIES 2019-10-11 14:36:35 +01:00
Fermi 3ae8581d96 HOPE 2019-10-11 14:34:40 +01:00
deathride58 ae843435f0 Merge pull request #9460 from Ghommie/Ghommie-cit230
quickfixes lowpop nuclear war tc malus calculation.
2019-10-10 15:20:20 -04:00
Ghommie e734b36ee3 quickfixes lowpop nuclear war tc malus calculation. 2019-10-10 20:54:19 +02:00
CitadelStationBot 1d2b935104 Automatic changelog generation for PR #9324 [ci skip] 2019-10-10 04:23:17 -05:00
kevinz000 3e6415d4b5 Merge pull request #9324 from Linzolle/crusher
Ports "Adds toggleable light and blinking charging light to crusher" and "Lets the kinetic crusher be one-hand carried"
2019-10-10 02:23:15 -07:00
CitadelStationBot aece7b8840 Automatic changelog generation for PR #9412 [ci skip] 2019-10-10 04:21:34 -05:00
kevinz000 0f74a735cb Merge pull request #9412 from Ghommie/Ghommie-cit213
Ports "Makes supermatter melt walls if it finds itself in one"
2019-10-10 02:21:32 -07:00
kevinz000 d9ff4235eb Merge pull request #9447 from Ghommie/Ghommie-cit223
No digitigrade plasmaman suits sprites for the time being, thank you.
2019-10-10 02:20:45 -07:00
CitadelStationBot 97e7435425 Automatic changelog generation for PR #9257 [ci skip] 2019-10-10 04:19:20 -05:00
kevinz000 fda64df569 Merge pull request #9257 from Thalpy/Blind-quirk-without-anger
[READY] Blind quirk without anger
2019-10-10 02:19:17 -07:00
CitadelStationBot 59ba51d865 Automatic changelog generation for PR #9368 [ci skip] 2019-10-10 04:18:27 -05: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
CitadelStationBot 1bbc837b9a Automatic changelog generation for PR #9415 [ci skip] 2019-10-10 04:13:27 -05:00
kevinz000 6e029c3360 Merge pull request #9415 from Ghommie/Ghommie-cit214
Removes the minimum player cap for the war ops in favour or a more proportional telecrystal bonus.
2019-10-10 02:13:25 -07:00
CitadelStationBot 3e1e6a18d0 Automatic changelog generation for PR #9439 [ci skip] 2019-10-10 04:12:57 -05:00
kevinz000 b233d3556e Merge pull request #9439 from JTGSZ/dominatorfix
Fixes Dominator countdown continuing after BoH movement, tweaks view amount
2019-10-10 02:12:55 -07:00
CitadelStationBot 70983ac6e4 Automatic changelog generation for PR #9432 [ci skip] 2019-10-10 04:12:43 -05:00
kevinz000 fb028b7997 Merge pull request #9432 from Putnam3145/pandemic-qol
Made PanD.E.M.I.C beaker stuff more like ChemMaster
2019-10-10 02:12:41 -07:00
CitadelStationBot b9e688f615 Automatic changelog generation for PR #9446 [ci skip] 2019-10-10 04:11:19 -05:00
kevinz000 f791b399a0 Merge pull request #9446 from Sishen1542/ung
abscond can no longer be cast from inside a locker
2019-10-10 02:11:17 -07:00
kevinz000 c4f8956985 Merge pull request #9433 from Poojawa/hoss-tails
Corrects a missing tail state
2019-10-10 02:10:31 -07:00
CitadelStationBot fbf6dce1b4 Automatic changelog generation for PR #9452 [ci skip] 2019-10-10 04:10:10 -05:00
kevinz000 236dcc4d63 Merge pull request #9452 from Ghommie/Ghommie-cit225
Stops non-alphanumeric graffiti decals from being named "letter".
2019-10-10 02:10:08 -07:00
CitadelStationBot cbbbc13861 Automatic changelog generation for PR #8615 [ci skip] 2019-10-10 04:09:54 -05:00
kevinz000 f686ea75d3 Merge pull request #8615 from Ghommie/Ghommie-cit45
Virtual reality componentization.
2019-10-10 02:09:51 -07:00
CitadelStationBot e80923fdf0 Automatic changelog generation for PR #8401 [ci skip] 2019-10-10 04:09:39 -05:00
kevinz000 0c9a065096 Merge pull request #8401 from Ghommie/Ghommie-cit11
Refactoring Implants' loc n°3
2019-10-10 02:09:37 -07:00
CitadelStationBot 34a540cebb Automatic changelog generation for PR #9234 [ci skip] 2019-10-10 04:09:23 -05:00
kevinz000 c1bc1d2c77 Merge pull request #9234 from Trilbyspaceclone/reebee_redone
[WIP] [TEST-MERGE] Makes clock work reebe less laggy + addtions
2019-10-10 02:09:21 -07:00
Thalpy 41946dd9cf Updates icons 2019-10-10 09:27:15 +01:00
Thalpy 348f6a4db4 Fixes Icons 2019-10-10 07:36:44 +01:00
Thalpy eaa84418c9 Fixes compile errors 2019-10-10 07:17:22 +01:00
Fermi 8f9622cbe2 Well lets try it 2019-10-09 18:01:09 +01:00
Fermi 53e8d64388 Ah I see now 2019-10-09 17:51:14 +01:00
Ghommie 2ac24b2ac6 Fixing head rev blebs 2019-10-09 18:18:49 +02:00
Fermi 746a656c27 Merge branch 'master' into Spookytime 2019-10-09 16:44:39 +01:00
Fermi 35fe28ce43 oof 2019-10-09 16:40:55 +01:00
Fermi 8a7f27803c Maybe 2019-10-09 16:40:01 +01:00
Fermi c4ac815598 Oof 2019-10-09 16:35:20 +01:00
Fermi 3eea5310c9 Ugh 2019-10-09 16:32:55 +01:00
Fermi b023671db4 Damnit Jaqc 2019-10-09 16:22:09 +01:00