Artur
|
0867f92c4a
|
Fixes APC Interface locks
|
2020-07-10 19:52:49 +03:00 |
|
Artur
|
84a22a9f49
|
Fixes cloning species transfer
|
2020-07-09 23:06:57 +03:00 |
|
Artur
|
9de8483bcf
|
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
|
2020-07-09 22:14:20 +03:00 |
|
silicons
|
93e0ceded7
|
Update canister.dm
|
2020-07-09 03:01:56 -07:00 |
|
silicons
|
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 |
|
silicons
|
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 |
|
silicons
|
be49be022b
|
Merge pull request #12710 from Sneakyrat6/hoodieFix
Fixes hair falling out of hoodies
|
2020-07-08 22:52:20 -07:00 |
|
silicons
|
9828d6fe85
|
Merge pull request #12700 from KeRSedChaplain/POSTRATVAR
Post This Ratvar, OR how I regained my contributor role in one simple step, OR how I buffed clock cult unknowingly.
|
2020-07-08 22:51:36 -07:00 |
|
Artur
|
e12d690d3f
|
hopefulyl fixes cloning!?!?
|
2020-07-08 23:54:00 +03:00 |
|
Artur
|
0a9dc33ce1
|
Reverts cloning changes
|
2020-07-08 23:42:47 +03:00 |
|
Artur
|
e3ba2e60c6
|
Not supported
|
2020-07-08 20:31:08 +03:00 |
|
silicons
|
6d1ca993f6
|
Merge pull request #12648 from timothyteakettle/tray-and-jar
bluespace tray + bluespace jar
|
2020-07-08 03:10:44 -07:00 |
|
Sneakyrat6
|
fa8ea6c430
|
Merge remote-tracking branch 'upstream/master' into hoodieFix
|
2020-07-07 23:48:59 -05:00 |
|
Sneakyrat6
|
3569e8da1e
|
Fixes hair falling out of hoodies
|
2020-07-07 22:31:00 -05:00 |
|
Timothy Teakettle
|
f0935a784d
|
two missing traits woops
|
2020-07-07 23:24:25 +01:00 |
|
Timothy Teakettle
|
e07909ebe2
|
does it in a far superior way
|
2020-07-07 23:12:36 +01:00 |
|
Lin
|
33f56fd168
|
Merge pull request #12694 from Ghommie/Ghommie-cit833
mowing down experimental cloner copypasta.
|
2020-07-07 13:23:25 -05:00 |
|
Cirno
|
37f4022bfc
|
Changed slime core to slime nucleus
|
2020-07-07 13:35:30 -03:00 |
|
Artur
|
280d3de6c3
|
Merge remote-tracking branch 'origin/master' into TGUI-3.0
|
2020-07-07 18:37:45 +03:00 |
|
Cirno
|
fe45971e43
|
Added a slime core in the place of brains for jelly people
|
2020-07-07 12:05:06 -03:00 |
|
timothyteakettle
|
ab5795b3d3
|
Update pet_carrier.dm
|
2020-07-07 03:03:09 +01:00 |
|
silicons
|
5b09b68c6d
|
Merge pull request #12702 from DeltaFire15/actually-kill-once
[s] Fixes the 'Kill once' objective
|
2020-07-06 17:38:24 -07:00 |
|
silicons
|
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 |
|
silicons
|
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 |
|
Ghom
|
c2746c723e
|
Merge pull request #12698 from Owai-Seek/beebalmfix-7-4-20
Fixes Bee Balm
|
2020-07-07 00:22:33 +02:00 |
|
DeltaFire
|
eeadc9a0e7
|
fixes the kill once objective
the target being afk / disconnecting is now only accepted at roundend, and doesn't lead to it being regarded as permanently completed midround.
|
2020-07-06 23:00:36 +02:00 |
|
Ghom
|
e7d19f512e
|
Merge pull request #12397 from Rohesie/cooldown
Ports TGMC timer cooldowns
|
2020-07-06 22:54:58 +02:00 |
|
Ghom
|
bc5e7d1513
|
Merge pull request #12688 from Weblure/small-strides-fix
[READY] Fixes Small Strides Formula
|
2020-07-06 22:48:09 +02:00 |
|
Ghommie
|
afb5b5237c
|
linter & stuff.
|
2020-07-06 22:42:32 +02:00 |
|
Keate Senior
|
4ee72305d0
|
Post This Justiciar
sprites and object
|
2020-07-06 06:34:38 -04:00 |
|
Artur
|
8cbe248465
|
Updates paper to TG
|
2020-07-06 13:09:02 +03:00 |
|
Artur
|
3154e8c596
|
Updates components to TG and fixes can
|
2020-07-06 10:58:48 +03:00 |
|
Winter Flare
|
482785d922
|
Fixes Bee Balm
|
2020-07-05 19:14:03 -04:00 |
|
Artur
|
7ebc785437
|
fIXES UPLINK
|
2020-07-05 21:52:24 +03:00 |
|
Cirno
|
45d97b2251
|
increased the amount of stuff the chem master can dispense from 10 to 20
|
2020-07-05 11:17:37 -03:00 |
|
Ghommie
|
562b57095d
|
mowing down the experimental cloner copypasta.
|
2020-07-05 03:04:53 +02:00 |
|
Lin
|
703d03453b
|
Merge pull request #12651 from Citadel-Station-13/silicons-patch-9
lowers shield blocking stamcost/second 3.5 to 2.5
|
2020-07-04 14:16:06 -05:00 |
|
Lin
|
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 |
|
Lin
|
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 |
|
Ghommie
|
3ba077be71
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit833
|
2020-07-04 21:04:33 +02:00 |
|
Ghommie
|
780f30bd4d
|
Fixing cloning
|
2020-07-04 21:01:44 +02:00 |
|
Ghom
|
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 |
|
Ghom
|
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 |
|
Ghom
|
c5b94a4d00
|
Update code/modules/antagonists/revenant/revenant.dm
|
2020-07-04 18:30:01 +02:00 |
|
silicons
|
ca6fc8d813
|
Update revenant.dm
|
2020-07-04 06:48:00 -07:00 |
|
Artur
|
a304ed7f49
|
Canister and paper updates
should fix papah exploits, though some runtiming is occuring
|
2020-07-04 16:14:42 +03:00 |
|
silicons
|
bb065abab7
|
Merge pull request #12690 from BlackMajor/master
[s] Inheritance is something often overlooked.
|
2020-07-04 01:52:13 -07:00 |
|
BlackMajor
|
afdf8c698a
|
fuck
|
2020-07-04 19:30:20 +12:00 |
|
silicons
|
03aa8fcc2b
|
Update autobunker.dm
|
2020-07-04 00:14:32 -07:00 |
|
silicons
|
ae5fb008c7
|
Update client_defines.dm
|
2020-07-04 00:13:34 -07:00 |
|