shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
34,303 Commits 5 Branches 0 Tags
b3afed69f44f6b8564951ebeef06f7acf8beefaf
Commit Graph

14810 Commits

Author SHA1 Message Date
kevinz000 0ed3b17d28 Merge pull request #12179 from Putnam3145/fix-atmos 
Brings back the gas archive
 2020-05-11 04:19:50 -07:00
kevinz000 657a4831b4 Merge pull request #12182 from kappa-sama/patch-25 
you can now mass produce electrochromatic kits
 2020-05-11 04:18:48 -07:00
kevinz000 f1ba2ae8e4 Merge pull request #12196 from Citadel-Station-13/Ghommie-patch-1 
bumps up savefile version cause horns/wings
 2020-05-11 04:18:29 -07:00
kevinz000 992905846d Merge pull request #12160 from Linzolle/cold-mining 
Explorer's gear gives full-body cold resistance
 2020-05-11 04:08:17 -07:00
kevinz000 8cbe44f20c Merge pull request #12192 from Ghommie/Ghommie-cit737 
Reorganizing techweb nodes into a subfolder.
 2020-05-11 04:07:16 -07:00
Lin 5a6b48cdfb Merge pull request #12191 from Ghommie/Ghommie-cit736 
Fixing IPCs and synth lizard antennas not showing up.
 2020-05-11 03:40:39 +00:00
Lin d9cd4f37f2 Merge pull request #12157 from Ghommie/Ghommie-cit731 
Fixing some runtimes and issues.
 2020-05-11 03:34:04 +00:00
kevinz000 f292d4047c Adds OOC notes (#12067) 
* ooc notes

* fixes

* repath

* ok

* This SHOULD compile, or else...

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-05-11 01:35:48 +02:00
Trilbyspaceclone b019915d10 Removes alien crate adds ape crate (#12178) 
* Update science.dm

* Update snacks_meat.dm

* Update science.dm

* Apply suggestions from code review

kinda didnt want to just take tg's ape cubes but what ever

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

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-05-11 01:10:45 +02:00
Ghommie 7109851089 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit742 2020-05-11 00:46:51 +02:00
Ghommie e8a0ea5acc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit731 2020-05-11 00:34:22 +02:00
Ghom 9b68a036af Update ice_demon.dm 2020-05-10 23:53:37 +02:00
kevinz000 7cfbdf3a1d Update human.dm (#12203) 2020-05-10 23:51:49 +02:00
Ghommie 46ba884965 A few runtimes, fixed. 2020-05-10 23:47:30 +02:00
kevinz000 1a0808170d sliightly better 2020-05-10 14:30:09 -07:00
kevinz000 1cf2311930 Merge pull request #12164 from Ghommie/Ghommie-cit733 
Porting "Refactors language holder"
 2020-05-10 14:16:42 -07:00
kevinz000 6b9fc7eccf Merge pull request #12169 from Ghommie/Ghommie-cit734 
Porting some radial menu updates, and that one clown mask skin.
 2020-05-10 14:14:19 -07:00
Ghommie 5ed6a18ef7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit740 2020-05-10 22:36:04 +02:00
Ghommie e0b91c53af Purging unused dogborg items. 2020-05-10 22:17:05 +02:00
Ghommie 667c12d413 nutrition adjustment wrapper procs. 2020-05-10 21:41:50 +02:00
kevinz000 c2e689aec0 i'm salty (#12181) 2020-05-10 21:33:56 +02:00
Lin dd7db603d2 Merge pull request #12159 from Ghommie/Ghommie-cit732 
'mob_run_block' and 'mob_check_block' macros
 2020-05-10 18:25:16 +00:00
kevinz000 05cede4e4d fixes xenomorphs not being in combat mode (#12193) 
* ok

* Update combat.dm
 2020-05-10 17:38:07 +02:00
Ghom 84f95d032d Update preferences_savefile.dm 2020-05-10 14:14:32 +02:00
Lin e7fedd7d12 Merge pull request #12148 from Trilbyspaceclone/patch-369 
Adds Ice hiking boots to miner venders
 2020-05-10 05:36:38 +00:00
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
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