silicons
0331f0cdc3
Merge pull request #13189 from timothyteakettle/revert-13187-revert-13110-cum
...
Revert "[TESTMERGE ONLY] FUCK"
2020-08-18 18:52:52 -07:00
silicons
f611945b34
Merge pull request #13180 from Detective-Google/glass-floors
...
ports multiz glass floors (tgstation/tgstation#50831 )
2020-08-17 03:14:15 -07:00
Putnam3145
23b4ba3714
Merge pull request #13063 from silicons/supermatter
...
Ports /tg/ supermatter - no more infinite stunlock death on charge inertia delaminations
2020-08-17 03:13:14 -07:00
Timothy Teakettle
f5300750b5
Revert "[TESTMERGE ONLY] FUCK"
2020-08-17 03:18:36 +01:00
silicons
4cd731ce11
Revert "cease your shitcode: cum edition"
2020-08-16 19:06:57 -07:00
silicons
8dedcbcf76
Merge branch '13113'
2020-08-16 18:53:35 -07:00
silicons
690f610f62
Merge branch '13168'
2020-08-16 18:52:04 -07:00
silicons
397cdb6c03
Merge branch '13129'
2020-08-16 18:45:35 -07:00
Detective Google
016fd2ac3c
woo yeah yeah woo
2020-08-15 23:55:52 -05:00
MrJWhit
60446316bb
Update _flags.dm
2020-08-14 21:14:21 -04:00
ancientpower
99d73388f8
lets ghosts see the contents of closets
2020-08-11 16:40:03 -05:00
Timothy Teakettle
4a2bbe66d6
Merge branch 'master' into cum
2020-08-11 18:30:30 +01:00
silicons
a8d61b60ef
Merge pull request #13011 from timothyteakettle/insane-shot-eyepatch
...
adds a cybernetic eyepatch to the syndicate uplink
2020-08-11 01:47:32 -07:00
kiwedespars
eb8574d6d6
heretics from tg (with changes)
2020-08-10 19:17:26 -07:00
Timothy Teakettle
ef3b0fd936
no need for this repetition
2020-08-10 21:47:59 +01:00
Timothy Teakettle
033fe553e8
cease your shitcode
2020-08-10 21:41:06 +01:00
silicons
f20f01cc6b
Merge pull request #12853 from LetterN/TGUI-4
...
TGUI4 port
2020-08-09 05:46:21 -07:00
silicons
3068accd2b
Merge pull request #13082 from Putnam3145/anaphro
...
Removed (an)aphrodisiacs.
2020-08-09 05:39:56 -07:00
silicons
d25daec117
Merge pull request #13081 from Putnam3145/ethereals
...
Ports ethereals from TG
2020-08-09 05:39:43 -07:00
silicons
3acd4ac6de
Merge pull request #13069 from Chiirno/radioactive-port
...
Ports TG #51879 - Makes rads glow, buffs rad goggles
2020-08-09 05:35:08 -07:00
Letter N
f1c4a7f6ac
Merge remote-tracking branch 'origin/master' into TGUI-4
2020-08-09 14:54:16 +08:00
Lin
dea2dab536
Merge pull request #13055 from Citadel-Station-13/silicons-patch-78
...
squeaking objects including air horns and clockwork boots now have a default 1 second cooldown. squeaking objects crossing each other will on average only allow 3 squeaks to occur, because if byond is literally running out of sound channels you know the fun has went too far
2020-08-08 12:06:42 -05:00
Putnam
467f66b2a6
Removed crocin/hexacrocin.
2020-08-08 00:46:30 -07:00
Putnam
9bb3ba5c5a
added ethereals
2020-08-08 00:08:43 -07:00
Lynxless
14e35806b9
I hope this works
2020-08-07 16:23:15 -03:00
silicons
9703bb38b1
Fixes
2020-08-07 06:22:46 -07:00
silicons
375e764e4c
support updates
2020-08-07 06:19:39 -07:00
silicons
65839060c9
Fixes
2020-08-06 23:39:57 -07:00
silicons
3640a33ff6
e
2020-08-06 23:22:53 -07:00
silicons
8edb374a20
sigh
2020-08-06 23:09:02 -07:00
silicons
1586625e6b
Merge pull request #12960 from timothyteakettle/loadout-you-say
...
loadout changes part 1: adds subcategories to the loadout
2020-08-06 21:59:13 -07:00
silicons
58a19ffe4b
Update signals.dm
2020-08-06 21:38:11 -07:00
silicons
009f0ebeeb
Merge pull request #13013 from DeltaFire15/newnew-clock-misc-stuff
...
N tvsg sebz Nezbere (or: a bunch of clockcult related stuff)
2020-08-06 19:37:30 -07:00
Letter N
333ca2cc7b
Merge remote-tracking branch 'origin/master' into TGUI-4
2020-08-06 18:26:04 +08:00
Lin
bc2e97a2a4
Merge pull request #13006 from Citadel-Station-13/silicons-patch-68
...
2x's volumetric storage minimum size because i'm going to stop pretending this ugly shit is usable when even i myself use opt-out to old interface
2020-08-05 19:42:28 -05:00
DeltaFire
2a197af1c0
Merge remote-tracking branch 'upstream/master' into newnew-clock-misc-stuff
2020-08-04 17:30:38 +02:00
Timothy Teakettle
ef53f3faea
the old system isnt needed really but sure i guess
2020-08-04 11:43:15 +01:00
Letter N
454baea55f
Merge remote-tracking branch 'origin/master' into TGUI-4
2020-08-04 09:31:34 +08:00
silicons
a4132c04ea
Merge pull request #12894 from timothyteakettle/wounds-part-2
...
port of wounds part 2
2020-08-03 14:43:07 -07:00
Timothy Teakettle
2bbe4631d6
working ricochets
2020-08-03 14:46:24 +01:00
Letter N
a19e306137
less redtext - updates anomalies
2020-08-03 20:53:36 +08:00
DeltaFire
932eeeecef
rites actually work now
...
Rites can be casted now, added a show info option on the sigil of rites, adds a TON of debug messages, if this is PRd while they are still in yell at me loudly. Also adds the rite of advancement, a rite used to implant organs into a servant, without surgery being required.
2020-08-03 14:43:50 +02:00
silicons
d5a19ea4b2
Merge pull request #13004 from zeroisthebiggay/tailwagfuckyou
...
prefs for headpat wagging
2020-08-03 02:30:57 -07:00
DeltaFire
abf825280b
Modifies a bunch and adds rite support
...
Clockie implants don't get detected by medscanners, brass claws get combo aka bonus damage on consecutive attacks against the same target, spears have a check for now accidentally draining vitality, and rite support has been added via a special sigil, though as of now there only is the 'base' rite which should never actually exist / be casted
2020-08-02 21:43:41 +02:00
Timothy Teakettle
0bf9553eca
hmm
2020-08-02 19:13:39 +01:00
Timothy Teakettle
289c186f32
Merge remote-tracking branch 'upstream/master' into wounds-part-2
2020-08-02 18:11:07 +01:00
silicons
06f5ce6401
buffs shoving ( #12925 )
...
* ^w^
* ok
* ok
2020-08-02 18:30:09 +02:00
silicons
f0a02c2c99
Update _storage.dm
2020-08-01 23:35:42 -07:00
zerothebigboy
34a8d8f798
a
2020-08-02 01:38:23 -04:00
Timothy Teakettle
7c8f03a81f
new defines
2020-08-01 18:29:27 +01:00
