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 |
|
Ghommie
|
ae053a9a08
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit800
|
2020-06-23 03:12:49 +02: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 |
|
Ghommie
|
de77b7139c
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
|
2020-06-23 00:13:14 +02: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 |
|
Artur
|
a02e6ab03e
|
Compile
|
2020-06-22 21:30:54 +03:00 |
|
Artur
|
c41d2e78be
|
Conflicts!!!
|
2020-06-22 17:39:24 +03: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 |
|
Ghommie
|
43acf79dd3
|
oh wow
|
2020-06-19 21:55:01 +02:00 |
|
Ghommie
|
162549a3c2
|
Fixing stuff.
|
2020-06-19 20:34:51 +02:00 |
|
Ghommie
|
d555394290
|
Let's just use tgstation's.
|
2020-06-19 19:01:05 +02:00 |
|
Timothy Teakettle
|
7fa5107b4b
|
all methods of cooking define quality
|
2020-06-19 17:16:34 +01:00 |
|
Timothy Teakettle
|
a8f4988c36
|
alter form updates hair
|
2020-06-19 17:09:54 +01:00 |
|
Lin
|
3cdc73ff35
|
Merge pull request #12487 from kevinz000/erp_2
Adds ||italics|| __underline__ ++bold++ support because why the fuck not
|
2020-06-18 13:37:10 -05:00 |
|
Lin
|
7d30d7c7ff
|
Merge pull request #12545 from Citadel-Station-13/kevinz000-patch-1
maybe fixes conveyors being a crash vector
|
2020-06-18 13:34:31 -05:00 |
|
nik707
|
1f53cd34d3
|
Merge pull request #12563 from kevinz000/shuttles
fixes master (shuttles not loading)
|
2020-06-18 10:41:20 -05:00 |
|
kevinz000
|
8a90590263
|
Update species.dm
|
2020-06-18 08:25:49 -07:00 |
|
kevinz000
|
1b5ea90c8f
|
sigh
|
2020-06-18 08:16:05 -07:00 |
|
shellspeed1
|
b490f02c78
|
Ports IV bags from TG
Ports the iv bag portion of https://github.com/tgstation/tgstation/pull/44531/files from tg.
|
2020-06-18 02:30:58 -07:00 |
|
SmArtKar
|
17c38efbb0
|
Runtime Fixes
|
2020-06-18 11:24:08 +03:00 |
|
kevinz000
|
291004d0fb
|
Update species.dm
|
2020-06-17 22:44:08 -07:00 |
|