DeltaFire
|
bbcf23fae9
|
Merge pull request #14182 from Citadel-Station-13/silicons-patch-8
i hate xenobiology players
|
2021-02-05 16:09:58 +01:00 |
|
silicons
|
3f4aff09d1
|
Update code/modules/research/xenobiology/crossbreeding/_status_effects.dm
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
|
2021-02-05 00:59:19 -07:00 |
|
raspy-on-osu
|
a7dd74201c
|
2
|
2021-02-04 16:51:06 -05:00 |
|
raspy-on-osu
|
3a3b3966a1
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ventcrawling-refactor-fix2
|
2021-02-04 16:46:37 -05:00 |
|
silicons
|
89c63a243f
|
Update card.dm
|
2021-02-04 13:23:03 -07:00 |
|
silicons
|
055b1a1db8
|
Merge pull request #14183 from timothyteakettle/by-armok-by-beard
dwarf facial hair is no longer randomised
|
2021-02-04 12:56:01 -07:00 |
|
silicons
|
497c6b8d2c
|
Merge pull request #14174 from keronshb/meathook-adjustment
Meathook Adjustments
|
2021-02-04 12:53:14 -07:00 |
|
silicons
|
a3fc6b7f80
|
Merge pull request #14170 from SmArtKar/firer_fix
Fixes KAs being broken by circuits
|
2021-02-04 12:50:19 -07:00 |
|
silicons
|
993a849700
|
Merge pull request #14155 from SmArtKar/tgui_observe
Port of TG's "Auto Observe"
|
2021-02-04 12:49:09 -07:00 |
|
silicons
|
bec5d6d8a3
|
Merge pull request #14132 from shellspeed1/salt-nerf-romerol
MASSIVE SALT NERF
|
2021-02-04 12:45:11 -07:00 |
|
Lin
|
2d3627b75c
|
Merge pull request #13895 from Citadel-Station-13/silicons-patch-53
Restores speedup to meth and nuka cola
|
2021-01-31 23:35:37 -06:00 |
|
Lin
|
0dd82df64b
|
Merge pull request #14113 from silicons/piggybacking
fixes piggybacking initial offsets. Also, adds the ability to carry around pAIs, because this totally won't result in more metaclique drama.
|
2021-01-31 23:33:59 -06:00 |
|
timothyteakettle
|
276dfee0d8
|
Update dwarves.dm
|
2021-02-01 01:29:37 +00:00 |
|
silicons
|
503d71ea45
|
Update _status_effects.dm
|
2021-01-31 18:03:36 -07:00 |
|
keronshb
|
68b65c3f93
|
Fixes some error, re adds knockdown
should prevent item drops
|
2021-01-30 16:19:09 -05:00 |
|
keronshb
|
8a75d59db2
|
Meathook tweaks
Changes some values to make it a bit more fair.
|
2021-01-30 15:59:59 -05:00 |
|
shellspeed1
|
78651f00e3
|
Update uplink_stealth.dm
|
2021-01-30 01:27:22 -08:00 |
|
SmArtKar
|
98e75f4f29
|
Fixes nuclear and KA guns in IC
|
2021-01-30 12:13:06 +03:00 |
|
silicons
|
5037216f5a
|
Update eyes.dm
|
2021-01-29 22:16:14 -07:00 |
|
silicons
|
c554f0567e
|
Update human.dm
|
2021-01-29 11:57:28 -07:00 |
|
silicons
|
540b8c280b
|
Merge pull request #14156 from zeroisthebiggay/cooming
hair ports part two | now featuring skrell hair
|
2021-01-29 07:29:46 -07:00 |
|
silicons
|
e417d72703
|
Merge pull request #14150 from zeroisthebiggay/ohgodohfuck
a zero pr that didn't need a followup pr to fix bugs doesn't exist | adds the multicolor berets to loadout
|
2021-01-29 07:29:39 -07:00 |
|
silicons
|
4e446bf894
|
Merge pull request #14154 from timothyteakettle/stop-encoding-twice
i broke adminpms and this fixes them sorry
|
2021-01-28 16:49:51 -07:00 |
|
raspy-on-osu
|
8077d72edd
|
more efficient
|
2021-01-28 18:47:02 -05:00 |
|
raspy-on-osu
|
fe499636c3
|
init
|
2021-01-28 18:42:45 -05:00 |
|
zerothebigboy
|
0bc3c5292c
|
arooga
|
2021-01-28 12:31:23 -05:00 |
|
SmArtKar
|
a7bc066891
|
Auto-Observe!
|
2021-01-28 17:09:28 +03:00 |
|
Timothy Teakettle
|
938b924a37
|
yes
|
2021-01-28 11:12:27 +00:00 |
|
zerothebigboy
|
c6420ae433
|
fuck
|
2021-01-27 22:59:44 -05:00 |
|
silicons
|
fa2754c0fe
|
Update human.dm
|
2021-01-27 20:49:56 -07:00 |
|
silicons
|
1c99225fbd
|
Update human.dm
|
2021-01-27 20:48:07 -07:00 |
|
silicons
|
1d72a574b2
|
Merge pull request #14093 from timothyteakettle/rename-redescribe-loadout
loadout part 3: custom names and descriptions
|
2021-01-27 19:09:41 -07:00 |
|
silicons
|
a973a3b088
|
Merge pull request #14145 from zeroisthebiggay/aeughfuck
ports some hairstyles from rp because god knows we need some good hairs that aren't Short Hair 3 and Wisp
|
2021-01-27 19:08:25 -07:00 |
|
silicons
|
912b09d33b
|
Merge pull request #14146 from zeroisthebiggay/ooffuck
RP ports featuring accessories, small code fixes, shibari ropes, stockings, and celebrating 2021's animal or whatever
|
2021-01-27 19:08:19 -07:00 |
|
silicons
|
af3b237846
|
Merge pull request #14147 from timothyteakettle/fix-miner-bedsheet
fixes miner bedsheet
|
2021-01-27 19:08:00 -07:00 |
|
silicons
|
f623dde8df
|
Merge pull request #14142 from zeroisthebiggay/sexmask
adds aesthetic sterile masks (and the paper mask) to the loadout panel
|
2021-01-27 19:07:45 -07:00 |
|
Lin
|
f7c1cdc571
|
Merge pull request #14112 from silicons/ex_act_3
~~hugboxes~~ fixes the bug (that was probably my fault) that makes 1 dev explosions ALWAYS delete brain
|
2021-01-27 17:16:44 -06:00 |
|
zerothebigboy
|
ee74f2c06c
|
here comes fetish content
|
2021-01-27 15:38:34 -05:00 |
|
Timothy Teakettle
|
6d6b232afe
|
i hate shitcoders
|
2021-01-27 20:33:14 +00:00 |
|
zerothebigboy
|
f3072433ff
|
thankyoubasedrp
|
2021-01-27 14:56:26 -05:00 |
|
zerothebigboy
|
ad2864f137
|
aeughfuck
|
2021-01-27 13:30:44 -05:00 |
|
Putnam3145
|
8b9551b39c
|
Merge pull request #14056 from Citadel-Station-13/silicons-patch-14
disables rotatium due to it being horifically bugged and unmaintained
|
2021-01-26 22:24:14 -08:00 |
|
zeroisthebiggay
|
0bc8c9383c
|
Update miscellaneous.dm
|
2021-01-26 13:17:44 -05:00 |
|
zerothebigboy
|
7b2a6955cc
|
please
|
2021-01-26 13:13:09 -05:00 |
|
silicons
|
efc3ecef32
|
Merge pull request #14118 from DeltaFire15/slabs-and-silicons
About ratvarian borgs and spells sometimes not working (+ a few other small things)
|
2021-01-25 23:17:41 -07:00 |
|
silicons
|
a1e92e55aa
|
Merge pull request #14102 from Hatterhat/somatobuff-50513
[READY] somatoray buff - mutation locks + revolution ray
|
2021-01-25 23:17:29 -07:00 |
|
silicons
|
6a2ae34ebe
|
Merge pull request #14111 from Arturlang/revenant_TK
[READY]Gives the revenant TK
|
2021-01-25 23:17:09 -07:00 |
|
silicons
|
0c6e67ac81
|
Merge pull request #14127 from Hatterhat/tg-56348
tgstation#56348 - contractor TC buff
|
2021-01-25 23:04:01 -07:00 |
|
silicons
|
de8d778f76
|
Merge pull request #14134 from Arturlang/Give_improvements
[READY]Give Improved
|
2021-01-25 23:02:03 -07:00 |
|
silicons
|
36215c5d48
|
Merge pull request #14136 from shellspeed1/Fixes-infinite-floor-tiles
Ports a fix for infinite floor tiles from tg caused by a bug that was fixed a long time ago on tg code.
|
2021-01-25 23:01:23 -07:00 |
|