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

22839 Commits

Author SHA1 Message Date
Timothy Teakettle 3eb5901a57 air is good 2020-06-29 22:56:25 +01:00
Timothy Teakettle 70a2238f04 more pet carrier changes 2020-06-29 17:43:16 +01:00
timothyteakettle 2e4c5e322d tray and jar 2020-06-29 02:49:31 +01:00
silicons 13c2c335f4 Update chat_commands.dm 2020-06-26 10:50:09 -07:00
Ghom 8672f2e819 Merge pull request #12610 from Detective-Google/resting 
Lying down now respects the direction you're facing
 2020-06-26 13:40:11 +02:00
silicons a2a1ae3a2c Merge pull request #12592 from timothyteakettle/felinids-nya-when-tabled 
felinids nya when tabled
 2020-06-25 18:33:34 -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 54c8d58e52 Update clown_items.dm 2020-06-24 23:20:51 -07: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 c0e0226d3c faction check. 2020-06-24 23:18:03 +02:00
Ghommie fe3932a36e Fixing the snore-pocalypse, and another not so critical issue. 2020-06-24 23:08:40 +02:00
silicons 03c9762dcf Update files.dm 2020-06-24 12:11:49 -07: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 7d0d5e0b82 Merge pull request #12580 from Detective-Google/ghosts 
ghosts now appear at round-end (tg#51572
 2020-06-24 08:43:55 -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
Timothy Teakettle b83c428744 Update tables_racks.dm 2020-06-24 14:37:08 +01: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 89fa7d6d2f Merge pull request #12577 from Citadel-Station-13/silicons-patch-1 
removes snore spam
 2020-06-23 03:29:01 +02: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
Detective Google da68163c80 ghosts now appear at round-end 2020-06-22 15:43:32 -05:00
Detective Google 472ed97b8c port tg#51713 2020-06-22 15:32:23 -05:00
silicons 78df740d19 Update debuffs.dm 2020-06-22 13:24:36 -07: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