DeltaFire
|
c37bb9cc2a
|
Merge pull request #13842 from Citadel-Station-13/silicons-patch-35
deletes a tiny segment of dead code
|
2020-12-22 17:56:13 +01:00 |
|
DeltaFire
|
0b7f7178f9
|
Merge pull request #13843 from Citadel-Station-13/silicons-patch-36
allows varediting of admin stealthname
|
2020-12-22 17:55:37 +01:00 |
|
DeltaFire
|
b9b1548c7e
|
Merge pull request #13844 from Arturlang/minter
Fixes mint machine
|
2020-12-22 17:54:19 +01:00 |
|
DeltaFire
|
d796952800
|
Merge pull request #13835 from silicons/pugilist_parry
Pugilists can now parry most things with their bare hands
|
2020-12-22 17:42:19 +01:00 |
|
DeltaFire
|
261b9fc517
|
Merge pull request #13833 from kiwedespars/mmhmhm
bone chitin gloves no longer more murderous than an armblade
|
2020-12-22 17:41:20 +01:00 |
|
DeltaFire
|
d3f30d21cf
|
Merge pull request #13772 from silicons/respawn_system_2
adds a respawn/return to lobby system, tweaks cryo to preserve everything instead of just ""important items""
|
2020-12-22 17:40:33 +01:00 |
|
DeltaFire
|
6d361a87be
|
Merge pull request #13831 from silicons/pod
Fixes contractor pods not taking mobs on leave
|
2020-12-22 17:38:42 +01:00 |
|
silicons
|
c58a32b9c5
|
Merge pull request #13820 from DeltaFire15/temp-reebe-removal
[TESTMERGE ONLY] Temporarily disables Reebe
|
2020-12-22 09:35:47 -07:00 |
|
silicons
|
c939d7aaaf
|
Merge pull request #13822 from DeltaFire15/oops-all-stunhands
Fixes a thing in stunhands used on clockies
|
2020-12-22 09:32:40 -07:00 |
|
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
|
7a9e3fcb40
|
Merge pull request #13825 from raspy-on-osu/screw-windoors
Windoors stay open longer
|
2020-12-22 16:16:08 +01: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 |
|
DeltaFire
|
dd3711bb8a
|
Merge pull request #13823 from MrJWhit/maybe-less-christmas
Maybe less christmas
|
2020-12-22 05:57:54 +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
|
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 |
|
silicons
|
901fcddf44
|
Merge pull request #13819 from Hatterhat/surv-dag-buf
survival dagger light fix + butchery buff
|
2020-12-21 10:30:13 -07: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 |
|
raspy-on-osu
|
d3e224d9c1
|
init
|
2020-12-21 04:54:19 -05: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 |
|
silicons
|
ea21151462
|
LF
|
2020-12-20 18:55:45 -07:00 |
|
DeltaFire
|
8414db5add
|
Merge pull request #13814 from Xantholne/TwinSwordSheath
Fixes twin sword sheaths icon/item state from being blank sprites
|
2020-12-21 02:20:32 +01: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 |
|
Xantholne
|
1c968e6ebe
|
period equals
|
2020-12-20 16:00:18 -07: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
|
36a94c97e0
|
Merge pull request #13802 from Citadel-Station-13/silicons-patch-29
bandaid fixes meteors not spawning properly due to off by 1 error with zlevel transition
|
2020-12-20 18:27:47 +00: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 |
|