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

15029 Commits

Author SHA1 Message Date
silicons
3c4d3791a4 Update life.dm 2020-06-26 17:21:20 -07:00
silicons
13c2c335f4 Update chat_commands.dm 2020-06-26 10:50:09 -07:00
Detective-Google
8998373241 Update code/modules/mob/living/living_mobility.dm 
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-06-25 19:58:41 -05:00
Detective Google
ea5b155057 lying down now isnt random 2020-06-25 19:39:37 -05:00
silicons
cd893c60a2 Merge pull request #12600 from Ghommie/Ghommie-cit820 
Fixing the snore-pocalypse, and another not so critical issue.
 2020-06-24 20:27:16 -07:00
Ghom
0f3cd7bbd8 Merge pull request #12588 from Citadel-Station-13/Linzolle-patch-1 
organs now decay while dead again
 2020-06-24 23:36:07 +02:00
Ghommie
fe3932a36e Fixing the snore-pocalypse, and another not so critical issue. 2020-06-24 23:08:40 +02:00
silicons
39b58f0057 Merge pull request #12581 from Detective-Google/shunties 
prevents shunted AIs from doomsdaying (tg#51284)
 2020-06-24 08:44:48 -07:00
silicons
ee0173185b Merge pull request #12584 from Detective-Google/my-face-when-I-sledgehammer-away-missions-uwu 
Kicks away mission loot in the teeth
 2020-06-24 08:44:38 -07:00
silicons
e562cef202 Merge pull request #12582 from Detective-Google/gamer-smes 
SMESes should now work with self-charging cells (tg#51240)
 2020-06-24 08:44:19 -07:00
silicons
ac06f037e5 Merge pull request #12575 from dapnee/meme 
Wataur Bottle
 2020-06-24 08:44:08 -07:00
silicons
3cad6221ca Merge pull request #12571 from Detective-Google/medigygax 
Adds the medical-spec gygax
 2020-06-24 08:43:30 -07:00
silicons
9f6d0ba10b Merge pull request #12570 from NopemanMcHalt/orvilike_bonus 
Adds Kepi and Orvilike Kepi
 2020-06-24 08:43:03 -07:00
Lin
b303c1ebdd hm yes 2020-06-24 02:13:53 +00:00
Linzolle
15be6217bd Merge branch 'master' of github.com:Citadel-Station-13/Citadel-Station-13 into chemmaster 2020-06-23 20:49:12 -05:00
Ghom
db7c3b1ee3 Merge pull request #12574 from DeltaFire15/random-item-whoopsie 
Buying a 'random uplink item' can no longer force objective / class changes
 2020-06-24 00:28:00 +02:00
Ghom
b69a31fef1 Merge pull request #12565 from timothyteakettle/some-small-fixes 
two small fixes
 2020-06-23 03:36:16 +02:00
dapnee
147fd2d953 imagine forgetting a comma 
oop
 2020-06-22 19:35:27 -06:00
Detective Google
a406927c95 euthanizes spacebattle, helps wildwest a little (it's still shit) 2020-06-22 20:31:14 -05:00
Ghom
1ade833952 Merge pull request #12572 from DeltaFire15/no-free-nullcrates 
Disables the stray syndicate crate event
 2020-06-23 03:27:12 +02:00
Detective Google
98756b3bc7 snowdin is wack 2020-06-22 20:24:19 -05:00
dapnee
1b8ab9799d Update cola.dm 
adds wataur to cola machine
 2020-06-22 18:17:21 -06:00
Detective-Google
29ab16c3ed Update mechfabricator_designs.dm 2020-06-22 18:27:58 -05:00
dapnee
e63f6aed42 Merge remote-tracking branch 'upstream/master' into meme 2020-06-22 15:15:28 -06:00
Detective Google
099f594a30 SMESes should now work with self-charging cells (tg#51240) 2020-06-22 15:56:51 -05:00
Detective Google
715b1f85da prevents shunted AIs from doomsdaying (tg#51284) 2020-06-22 15:53:55 -05:00
dapnee
0f15b0ce84 hey look, I'm finished with a single meme item 
hahaha
 2020-06-21 18:49:58 -06:00
Lin
a0a4007332 Merge pull request #12567 from Citadel-Station-13/kevinz000-patch-5 
Slime color changing now has 65536 possible colors instead of 256
 2020-06-21 19:37:54 -05:00
dapnee
cfff6677b4 wataur 
hahaha, imagine if this worked
 2020-06-21 18:14:34 -06:00
Lin
2cd18f3dba Merge pull request #12557 from silicons/life 
Splits Life() into procs for physical and biological life processes in preparation for stasis beds
 2020-06-21 18:32:58 -05:00
silicons
99a7c49e52 Merge pull request #12561 from shellspeed1/Ports-kyro-chems 
Ports IV bags from TG
 2020-06-21 14:11:10 -07:00
silicons
8cd81ff89b Merge pull request #12488 from Ghommie/Ghommie-cit813 
Porting Cargo small-order support, cargo goodies packs, beating vendors for loot/squish.
 2020-06-21 14:10:45 -07:00
silicons
753fcbb84a Merge pull request #12556 from Detective-Google/bald-bald-bald-bald-bald-bald-bald 
Ports the reworked snowcabin and beach away missions
 2020-06-21 14:10:29 -07:00
Timothy Teakettle
983aac10a2 fixes it properly 2020-06-21 17:39:36 +01:00
Anonymous
9e7b884e86 Adds remaining TOSOrvikepi 2020-06-21 13:25:23 +03:00
Anonymous
384e951b1c Merge branch 'master' into orvilike_bonus 2020-06-21 12:03:28 +03:00
DeltaFire
82d21e4824 smol fix 2020-06-21 03:44:12 +02:00
shellspeed1
06f0d42ee9 makes chem packs slightly cheaper 2020-06-20 16:53:39 -07:00
Lin
905d4ee74d Merge pull request #12558 from Citadel-Station-13/kevinz000-patch-4 
Drastically buffs punch hit chance
 2020-06-20 18:44:17 -05:00
DeltaFire
6cababd09b yeeah no more free random nullcrates 2020-06-21 01:30:39 +02:00
Detective Google
ab05e48149 adds the medical gygax 2020-06-20 16:22:28 -05:00
Anonymous
45dab7fa66 Kepi and Orvilike Kepi 2020-06-20 22:52:33 +03:00
Detective Google
4e26916502 Merge remote-tracking branch 'upstream/master' into bald-bald-bald-bald-bald-bald-bald 2020-06-20 14:00:14 -05:00
Linzolle
b873f244c9 finally 2020-06-19 22:46:31 -05:00
kevinz000
354cc7d0c7 Update jellypeople.dm 2020-06-19 19:31:38 -07:00
Ghommie
48c13fcc10 Removing now unused old embed behavior 2020-06-20 00:15:52 +02:00
Ghommie
29a8d2ed78 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit813 2020-06-20 00:07:47 +02:00
kevinz000
6516e07bd8 Merge pull request #12566 from Ghommie/Ghommie-cit818 
Fixing some runtimes issues and warnings bout rnd.
 2020-06-19 14:22:40 -07:00
Ghom
e31ce2edcf Merge pull request #12414 from LetterN/asset-cache-thing 
asset cache + better minimaps
 2020-06-19 23:09:09 +02:00
Ghom
dd009ada48 Merge pull request #12542 from bunny232/scrubber 
Removes lewd events from the vent clog event
 2020-06-19 23:07:23 +02:00