silicons
|
5fb90629e3
|
Merge pull request #13828 from timothyteakettle/tail-entwine-fix
fix: you can only entwine tails with people who have a tail
|
2020-12-22 09:32:26 -07:00 |
|
silicons
|
318f8ac3d1
|
Merge pull request #13832 from Arturlang/tresspass_awakeness
Makes tresspas unusable while unconcious.
|
2020-12-22 09:32:09 -07:00 |
|
DeltaFire
|
65c14cf289
|
Merge pull request #13537 from silicons/permissions
support update for event manager permissions
|
2020-12-22 16:12:03 +01:00 |
|
Artur
|
d72617e7d7
|
Fixes mint machine
|
2020-12-22 12:35:21 +02:00 |
|
DeltaFire
|
219470e8c6
|
Merge pull request #13815 from YakumoChen/no-ezchem
Removes slime blood to jelly conversion
|
2020-12-22 06:17:41 +01:00 |
|
DeltaFire
|
bdbe1bc404
|
Merge pull request #13829 from silicons/keyloop
Bandaid fix for input controller lockup due to sleeping
|
2020-12-22 06:00:29 +01:00 |
|
silicons
|
5715ea97ce
|
Update holder2.dm
|
2020-12-21 21:52:44 -07:00 |
|
silicons
|
458f0e4491
|
Update deadsay.dm
|
2020-12-21 21:51:52 -07:00 |
|
silicons
|
310d4d573b
|
Update death.dm
|
2020-12-21 21:46:00 -07:00 |
|
silicons
|
911e4f7008
|
Update movement.dm
|
2020-12-21 21:39:19 -07:00 |
|
silicons
|
13f9bbef01
|
paramlist
|
2020-12-21 21:36:12 -07:00 |
|
silicons
|
9b83ae564a
|
e
|
2020-12-21 21:31:55 -07:00 |
|
silicons
|
221a98d27b
|
how'd this ever work
|
2020-12-21 21:25:00 -07:00 |
|
silicons
|
000e525157
|
ok
|
2020-12-21 21:11:54 -07:00 |
|
silicons
|
ea554b88a4
|
ok
|
2020-12-21 17:31:28 -07:00 |
|
silicons
|
5ff244a48c
|
t
|
2020-12-21 17:20:44 -07:00 |
|
silicons
|
97e4aad75f
|
changes
|
2020-12-21 17:14:22 -07:00 |
|
kiwedespars
|
0646d3f285
|
nerf...
|
2020-12-21 15:07:25 -08:00 |
|
Artur
|
ee9cf20aec
|
Awaken
|
2020-12-22 00:25:59 +02:00 |
|
silicons
|
1b11005e09
|
fix
|
2020-12-21 13:51:27 -07:00 |
|
silicons
|
ca6df29998
|
Update death.dm
|
2020-12-21 13:42:33 -07:00 |
|
Timothy Teakettle
|
2ca997e339
|
fix
|
2020-12-21 20:19:26 +00:00 |
|
silicons
|
0e7a597a2b
|
alright
|
2020-12-21 10:27:28 -07:00 |
|
timothyteakettle
|
3d897e8fc1
|
fixes tail entwining
|
2020-12-21 17:15:51 +00:00 |
|
silicons
|
7da6979b54
|
ok
|
2020-12-21 00:28:03 -07:00 |
|
silicons
|
97824f4030
|
ok
|
2020-12-21 00:14:48 -07:00 |
|
silicons
|
eef2a323ed
|
ok
|
2020-12-21 00:11:19 -07:00 |
|
silicons
|
ce10278c5a
|
changes
|
2020-12-20 19:25:49 -07:00 |
|
MrJWhit
|
994df11bc0
|
Update holidays.dm
|
2020-12-20 19:42:26 -05:00 |
|
DeltaFire
|
cfba083680
|
oops
|
2020-12-21 00:15:29 +01:00 |
|
silicons
|
db6f9349c5
|
Merge pull request #13785 from Putnam3145/fix-grab-bag
Makes grab bag ONLY make station antags; triples alien dynamic threat.
|
2020-12-20 15:42:04 -07:00 |
|
Lin
|
3ad777f8f7
|
Merge pull request #13755 from silicons/colormates
ports colormates from rp/vorestation
|
2020-12-20 18:14:48 +00:00 |
|
silicons
|
7b1b633b21
|
Merge pull request #13774 from keronshb/Clowncar
Clown Car The Honkening
|
2020-12-20 10:34:29 -07:00 |
|
silicons
|
11aad4e6db
|
Merge pull request #13801 from SandPoot/master
Makes limb grower better
|
2020-12-20 10:34:21 -07:00 |
|
silicons
|
e87bcb8aa1
|
Merge pull request #13809 from Putnam3145/harness-tweak-2
Makes gear harness cover nothing
|
2020-12-20 10:34:06 -07:00 |
|
silicons
|
8aafad611a
|
Merge pull request #13811 from BlackMajor/borg-hypo
Prevents borg hypos from injecting if it would OD the target while on help intent
|
2020-12-20 10:33:45 -07:00 |
|
silicons
|
78cf8389ba
|
Update code/modules/admin/sql_message_system.dm
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
|
2020-12-20 10:32:50 -07:00 |
|
Lin
|
f6a6c138df
|
Merge pull request #13776 from DeltaFire15/ai-kill-once
Makes Traitor AIs have 'kill once' objectives instead of 'assassinate'
|
2020-12-20 17:22:06 +00:00 |
|
Lin
|
a0eb6a9b5d
|
Merge pull request #13799 from Citadel-Station-13/silicons-patch-28
fixes space ninjas being able to hardstun with their gloves
|
2020-12-20 17:21:37 +00:00 |
|
DeltaFire
|
e5eff3b028
|
Merge pull request #13792 from Citadel-Station-13/silicons-patch-25
fixes TEG circulators not being movable when unanchored
|
2020-12-20 18:11:33 +01:00 |
|
silicons
|
34f6697e81
|
Merge pull request #13796 from keronshb/fixedscarpchanges
Scarp Changes and Bundle
|
2020-12-20 09:23:20 -07:00 |
|
Putnam
|
79e71b54e2
|
Made gear harness adjustable instead of none-cover by default.
|
2020-12-19 19:01:31 -08:00 |
|
DeltaFire
|
f458bc8182
|
Merge pull request #13803 from BlueWildrose/AI-RemoteDetonationCBT
Prevents traitor AI from doomsdaying while carded
|
2020-12-19 16:08:25 +01:00 |
|
YakumoChen
|
3bdf4bacdc
|
removes slime blood conversion
|
2020-12-19 10:28:56 +00:00 |
|
BlueWildrose
|
98b1de5536
|
oh yes we don't want that do we?
|
2020-12-18 22:56:39 -07:00 |
|
DeltaFire
|
b37d948358
|
Merge pull request #13794 from Citadel-Station-13/silicons-patch-27
this one line broke atmos more at 10
|
2020-12-19 05:38:10 +01:00 |
|
DeltaFire
|
1e8e1ec72b
|
Merge pull request #13786 from kiwedespars/why
x-ray laser nerfs
|
2020-12-19 05:28:43 +01:00 |
|
kiwedespars
|
9b710f5553
|
Update beams.dm
|
2020-12-18 15:53:11 -08:00 |
|
silicons
|
ca49f87e2c
|
Merge pull request #13804 from timothyteakettle/please-sanitize-pin-data
[s] sanitizes circuits get pin data
|
2020-12-18 10:32:24 -07:00 |
|
silicons
|
a41e1b1077
|
Update ninjaDrainAct.dm
|
2020-12-18 05:00:16 -07:00 |
|