Commit Graph

16247 Commits

Author SHA1 Message Date
Ghommie 2b429a93d2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit737 2020-05-10 06:30:41 +02:00
Ghommie 015660c806 Trilby's grammar is a F- 2020-05-10 06:21:29 +02:00
Ghommie c4c4285b00 Reorganizing techweb nodes in a subfolder. 2020-05-10 06:20:04 +02:00
Detective Google 424133c48a adds the actual snow taxi to snaxi 2020-05-09 22:20:26 -05:00
Ghommie 6666c651d5 Fixing IPCs and synth lizard antennas not showing up. 2020-05-10 03:06:39 +02:00
Detective Google 1d298232eb adds Snowmobiles, (ATVs that move fullspeed on snow and slow on plating) 2020-05-09 20:06:25 -05:00
kevinz000 f7808e97ad fix (#12188) 2020-05-10 02:58:58 +02:00
Ghommie 300331ccb7 Skill modifiers datum WIP. 2020-05-10 02:11:48 +02:00
Trilbyspaceclone b6fd7f18e2 Update large_objects.dm 2020-05-09 19:22:42 -04:00
kappa-sama 324d039f64 adds these 2020-05-09 18:00:23 -04:00
kevinz000 c94644ee31 ok 2020-05-09 13:47:11 -07:00
Putnam 7004001e4b Brings back the gas archive 2020-05-09 11:23:38 -07:00
kevinz000 6993aa20ce ok 2020-05-09 09:18:57 -07:00
kevinz000 5bc19fd8e3 math lmao 2020-05-09 09:08:14 -07:00
kevinz000 707ef069ef why 2020-05-09 08:45:56 -07:00
kevinz000 4f68eacfaa aa 2020-05-09 08:40:15 -07:00
kevinz000 b30dd2c1f2 okay 2020-05-09 08:06:42 -07:00
kiwedespars a6ad4dc9bf changeling rebalance. (#12134)
* Update fleshmend.dm

* Update shriek.dm

* Update mutations.dm

* makes aug-eyes into actual thermals.

* removing regen jelly and mannitol from adrenals

* Update strained_muscles.dm

* Update chameleon_skin.dm

* Update biodegrade.dm

* Update fleshmend.dm

whoops, forgot to add the loudness text.

* Update fleshmend.dm

why do i keep doing this.

* holy shit i'm tired.

* Update code/modules/antagonists/changeling/powers/augmented_eyesight.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update augmented_eyesight.dm

* Update augmented_eyesight.dm

* Update augmented_eyesight.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-05-09 14:38:18 +02:00
Putnam3145 c20c7f0698 Removes crocin, hexacrocin from emagged booze dispenser; makes crocin no longer "roofies" (??) (#12177)
* Removes crocin, hexacrocin from emagged booze dispenser

* what. what. what. what. what.
2020-05-09 14:34:30 +02:00
kevinz000 cdfdaac82e ok (#12161) 2020-05-09 14:21:27 +02:00
kevinz000 a380e71872 a 2020-05-09 00:16:29 -07:00
kevinz000 407b1c7447 Merge remote-tracking branch 'citadel/master' into projectiles_2 2020-05-08 23:32:01 -07:00
kevinz000 1981b6b3c7 Merge pull request #12130 from Ghommie/Ghommie-cit727
Dims the lights, again.
2020-05-08 23:30:19 -07:00
kevinz000 dcdda5451e Merge pull request #12146 from Trilbyspaceclone/patch-368
slows down ice demons
2020-05-08 23:29:50 -07:00
kevinz000 5a716bfcfd Merge pull request #12143 from Ghommie/Ghommie-cit729
Demodularizing a few sprite assets.
2020-05-08 23:29:34 -07:00
kevinz000 cfcac55654 Merge pull request #12142 from Ghommie/Ghommie-cit728
Demodularizing the arousal module.
2020-05-08 23:29:16 -07:00
kevinz000 a66aad9b70 compile 2020-05-08 23:03:44 -07:00
kevinz000 0f157204eb compile 2020-05-08 23:02:41 -07:00
kevinz000 19072abe37 compile 2020-05-08 23:01:05 -07:00
kevinz000 6d6239a8b4 kay 2020-05-08 22:59:51 -07:00
kevinz000 e684c6e574 ok 2020-05-08 22:40:07 -07:00
kevinz000 4cd5e08902 sigh 2020-05-08 21:27:36 -07:00
kevinz000 d309bc5e74 Instruments no longer keep updating if you aren't holding them etc etc (#12165)
* Update _song.dm

* Update item.dm
2020-05-09 03:15:42 +02:00
Hatterhat 6067370a6f shotgun shell clips (#11955)
* shell clips revised by based ghom

* lmao yeet better not forget that bit

* nitpicking but also merge 11976 first

* No freeloaders.

* Update weapon_designs.dm

Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com>
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-05-09 02:49:25 +02:00
Seris02 381333bf82 a (#11873) 2020-05-09 02:15:41 +02:00
kappa-sama cab55f8549 alternate buff (#11867) 2020-05-09 02:14:18 +02:00
Putnam3145 3531459d8b Some trauma rebalancing (#12144)
* Some trauma rebalancing.

* Wow I didn't actually commit the 50% change

* when did i stop compiling before pushing
2020-05-09 01:42:39 +02:00
kevinz000 3a8e9da73b Fixes projectiles going sanic (#12167)
* ok

* woops
2020-05-09 01:27:26 +02:00
Ghommie 88d86e53d0 Porting some radial menu updates, and that one clown mask. 2020-05-09 00:45:48 +02:00
Suicidalpickles 2d9aac8f31 cakehat cat wearing a cakehat while patting a cak (#12166)
fix
2020-05-09 00:40:07 +02:00
kevinz000 1872f556ac woops 2020-05-08 15:09:02 -07:00
kevinz000 afa006d280 ok 2020-05-08 15:02:38 -07:00
Ghommie 2858ddd90b Porting "Refactors language holder" 2020-05-08 22:44:02 +02:00
Ghommie ffd5dd9615 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit732 2020-05-08 19:01:28 +02:00
Ghommie a412e840f7 'mob_run_block' and 'mob_check_block' macros 2020-05-08 18:52:32 +02:00
Linzolle 24da94720b cold res 2020-05-08 11:51:24 -05:00
Artur ccae3aebd5 Trying to get the sleeper and clockworkslab to work 2020-05-08 19:50:49 +03:00
Ghommie 90bf157f5e Fixing some runtimes and issues. 2020-05-08 17:17:33 +02:00
kevinz000 77848bd90f tgs folder 2020-05-08 04:30:51 -07:00
Trilbyspaceclone 1472ea31a0 oops all the missing commas 2020-05-08 07:19:03 -04:00