a798061f71
also this
2020-07-09 16:14:38 -05:00
af106b7628
10
2020-07-09 16:12:07 -05:00
928a7a956f
Adds things to help the cult become station based
...
Adds (or re-adds I guess) the old spells and stuctures from parts based clock cult, soon to be meant for construction/power generation as well as possible QoL things
2020-07-09 16:30:52 -04:00
9de8483bcf
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
2020-07-09 22:14:20 +03:00
02f46322ad
port examine
2020-07-09 18:32:45 +01:00
26d384e65b
fix
2020-07-09 03:17:17 -07:00
93e0ceded7
Update canister.dm
2020-07-09 03:01:56 -07:00
bf4936cb02
Merge pull request #12707 from Chiirno/slimebrain
...
Resprited brains into a new slime core sprite for jelly people.
2020-07-09 02:26:27 -07:00
aae496492f
Update revenant.dm
2020-07-09 02:22:30 -07:00
bfa672b091
adds some rings to the wedding crate
2020-07-09 07:49:11 +00:00
1a82955f32
adds a wedding crate
2020-07-09 07:22:33 +00:00
eeedad21de
^w^
2020-07-09 14:32:23 +08:00
1b97c9954f
Merge pull request #12712 from TheObserver-sys/Imadeanoops
...
Hey, what if you could actually make the donuts?
2020-07-08 22:54:53 -07:00
be49be022b
Merge pull request #12710 from Sneakyrat6/hoodieFix
...
Fixes hair falling out of hoodies
2020-07-08 22:52:20 -07:00
a625d6562b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real
2020-07-08 22:02:03 -07:00
bed6f4ac91
Adds "Telecrystal Dust" a useless, red waste of syndicate resources that can be obtained by grinding raw telecrystals in a blender.
...
Also makes it so you can sell raw telecrystals at cargo 1000 points each which is also a considerable waste of TC.
2020-07-09 16:32:14 +12:00
7aa160029f
changes sent's healing a bit
...
No more killing augmented followers, it heals them aswell. Ratvar is a machine god afterall.
2020-07-08 23:45:35 +02:00
6d1ca993f6
Merge pull request #12648 from timothyteakettle/tray-and-jar
...
bluespace tray + bluespace jar
2020-07-08 03:10:44 -07:00
2d447019c5
woops
2020-07-08 16:59:22 +08:00
05684e7196
no config filter thing yet, but the code for it is "ready"
2020-07-08 16:36:58 +08:00
f757e54db9
muh immursion
2020-07-08 15:59:44 +08:00
45a3c47608
removes fun
2020-07-08 15:10:49 +08:00
6cbab55ef8
Merge remote-tracking branch 'citadel/master' into unarmed_parry
2020-07-07 21:07:58 -07:00
22c3d9fe3e
ok
2020-07-07 21:07:13 -07:00
bd8cc4791f
whew
2020-07-07 21:02:23 -07:00
6ee63f66aa
whew
2020-07-07 20:48:54 -07:00
3569e8da1e
Fixes hair falling out of hoodies
2020-07-07 22:31:00 -05:00
37f4022bfc
Changed slime core to slime nucleus
2020-07-07 13:35:30 -03:00
280d3de6c3
Merge remote-tracking branch 'origin/master' into TGUI-3.0
2020-07-07 18:37:45 +03:00
fe45971e43
Added a slime core in the place of brains for jelly people
2020-07-07 12:05:06 -03:00
6634e43be4
fix
2020-07-07 07:41:33 -07:00
cee15792b7
ok
2020-07-07 07:25:10 -07:00
9910867345
Update SDQL_2.dm
2020-07-07 06:19:17 -07:00
0c0bf46f7f
Merge pull request #12696 from Chiirno/emichemmastertweak
...
increased the amount of stuff the chem master can dispense from 10 to 20
2020-07-06 17:34:50 -07:00
4fa7a461ef
Merge pull request #12684 from Owai-Seek/foodport-p1-7/1/20
...
Food ports, tweaks, and fixes.
2020-07-06 17:19:07 -07:00
c2746c723e
Merge pull request #12698 from Owai-Seek/beebalmfix-7-4-20
...
Fixes Bee Balm
2020-07-07 00:22:33 +02:00
e7d19f512e
Merge pull request #12397 from Rohesie/cooldown
...
Ports TGMC timer cooldowns
2020-07-06 22:54:58 +02:00
bc5e7d1513
Merge pull request #12688 from Weblure/small-strides-fix
...
[READY] Fixes Small Strides Formula
2020-07-06 22:48:09 +02:00
8cbe248465
Updates paper to TG
2020-07-06 13:09:02 +03:00
3154e8c596
Updates components to TG and fixes can
2020-07-06 10:58:48 +03:00
482785d922
Fixes Bee Balm
2020-07-05 19:14:03 -04:00
45d97b2251
increased the amount of stuff the chem master can dispense from 10 to 20
2020-07-05 11:17:37 -03:00
4d29aa9148
Merge pull request #12650 from Citadel-Station-13/silicons-patch-7
...
adds a keybind to toggle active blocking instead of only press-hold
2020-07-04 14:13:18 -05:00
d04b335d1a
Merge pull request #12652 from silicons/cool
...
cybernetic implant shields will now automatically extend and be used to block if the user has no item to block with
2020-07-04 14:12:43 -05:00
c2ba973c88
Merge remote-tracking branch 'origin' into emi
2020-07-04 15:59:47 -03:00
020da9fa07
i hope this works
2020-07-04 15:47:38 -03:00
871993ce14
Merge pull request #12593 from silicons/autobunker
...
adds verb to auto bunker override on linked servers
2020-07-04 18:36:59 +02:00
17ee8c5960
Merge pull request #12660 from YakumoChen/master
...
Reverts improv small arms, makes guncrafting easier and faster
2020-07-04 18:35:22 +02:00
c5b94a4d00
Update code/modules/antagonists/revenant/revenant.dm
2020-07-04 18:30:01 +02:00
ca6fc8d813
Update revenant.dm
2020-07-04 06:48:00 -07:00
kappa-sama