Ghom
|
a2a2476243
|
Update shaft_miner.dm
|
2020-06-28 02:03:35 +02:00 |
|
Ghom
|
0d5888daf6
|
Merge pull request #12628 from Citadel-Station-13/silicons-patch-11
adds a __nan() proc to fetch a nan number because there's no other way to for debugging
|
2020-06-28 00:19:38 +02:00 |
|
silicons
|
2ab69c0170
|
Merge pull request #12603 from b1tt3r1n0/Pouches(again)
Some edits to pouches, and something that can hold sheets.
|
2020-06-27 14:54:57 -07:00 |
|
silicons
|
5c10370326
|
Merge pull request #12601 from Detective-Google/piggyback
piggyback carrying people is no longer comically slow
|
2020-06-27 14:54:44 -07:00 |
|
silicons
|
e51bee9649
|
Merge pull request #12607 from Detective-Google/cog-2
cog fixes round 2
|
2020-06-27 14:54:31 -07:00 |
|
silicons
|
45a6061958
|
Merge pull request #12596 from Ghommie/Ghommie-cit819
Porting further material datum features and improvements.
|
2020-06-27 14:53:28 -07:00 |
|
silicons
|
8b04fd70de
|
Merge pull request #12615 from Ghommie/Ghommie-cit821
Solving several issues.
|
2020-06-27 14:52:59 -07:00 |
|
Ghom
|
58778f2e6e
|
Merge pull request #12619 from timothyteakettle/what-if-blood-didnt-suck
slimes blood colour is their body colour
|
2020-06-27 22:14:17 +02:00 |
|
silicons
|
0c4e1e7696
|
Update SDQL_2_wrappers.dm
|
2020-06-27 07:17:29 -07:00 |
|
Timothy Teakettle
|
9c9868438c
|
some fixes
|
2020-06-26 22:49:43 +01:00 |
|
Timothy Teakettle
|
334d55bef3
|
add support for custom blood colours
|
2020-06-26 20:29:40 +01:00 |
|
silicons
|
13c2c335f4
|
Update chat_commands.dm
|
2020-06-26 10:50:09 -07:00 |
|
Ghommie
|
d1025b10cd
|
mh.
|
2020-06-26 18:49:20 +02:00 |
|
Ghommie
|
8f6b31c26e
|
Solving several issues.
|
2020-06-26 18:40:20 +02: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 |
|
Detective Google
|
5d99f68d8c
|
stinky panda goes in the box
|
2020-06-25 14:57:41 -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 |
|
b1tt3r1n0
|
a780b9037c
|
Some edits to pouches, and something that can hold sheets.
Title. Vendor edits and a minor engineering addition for those who want to hold sheets and shit.
|
2020-06-24 23:07:56 -04:00 |
|
Detective Google
|
a4c243331c
|
aeugh
|
2020-06-24 17:25:39 -05: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 |
|
Ghommie
|
c5cbfa64e5
|
Porting further material datum features and improvements.
|
2020-06-24 20:45:17 +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 |
|