shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,953 Commits 5 Branches 0 Tags
c939d7aaaf66777844aaa75bdc9a8dfe47d12e06
Commit Graph

17477 Commits

Author SHA1 Message Date
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
65c14cf289 Merge pull request #13537 from silicons/permissions 
support update for event manager permissions
 2020-12-22 16:12:03 +01: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
Artur
ee9cf20aec Awaken 2020-12-22 00:25:59 +02: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
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
BlackMajor
e50760f641 Lilly please that's not funny 2020-12-19 00:59:50 +13:00
BlackMajor
8f30d5a686 Update borghydro.dm 2020-12-19 00:46:04 +13:00
Putnam
5c7ddaeedd Makes nightmare dynamic-controlled 2020-12-17 23:43:17 -08:00
Poojawa
6fe6e6d779 Update Citadel_Snowflake.dm 2020-12-18 01:36:56 -06:00
Putnam
7711bc1751 Makes gear harness cover nothing 2020-12-17 23:33:36 -08:00
keronshb
118d7a1dbf ACTUALLY prevents the clown car from moving onto a space tile 
ACTUALLY prevents the clown car from moving onto a space tile
 2020-12-18 00:01:11 -05:00
timothyteakettle
2aaddc2ee4 Update helpers.dm 2020-12-18 01:53:53 +00:00
Blue Wildrose
d4d5e53cb6 go away Travis 2020-12-16 19:27:04 -07:00
Blue Wildrose
9c60de46a1 Prevent AI from doomsdaying while carded 2020-12-16 18:45:41 -07:00
SandPoot
a0ae0c37fe upload files 2020-12-16 11:39:50 -03:00
silicons
029c755e15 Update ninjaDrainAct.dm 2020-12-16 02:49:37 -07:00
kiwedespars
98c3335dce doubles xray laser cost, 20 -> 10 shots 2020-12-15 21:04:10 -08:00
kiwedespars
a95ba25d17 Update beams.dm 
25 -> 75 rad
15 -> 20 damage
 2020-12-15 21:02:46 -08:00
keronshb
3d7c896100 Scarp Changes and Bundle 
This should really fix it now.
 2020-12-15 20:10:21 -05:00
keronshb
d08da76253 This should actually fix the space tile thing 
Try 3
 2020-12-15 19:45:48 -05:00
silicons
1d81434bbd Update datum_pipeline.dm 2020-12-15 15:52:00 -07:00
Lin
d776bcc867 Merge pull request #13791 from Citadel-Station-13/silicons-patch-23 
[s]Update saved_circuits.dm
 2020-12-15 21:46:48 +00:00
Lin
c022956c75 Merge pull request #13725 from silicons/anti_collision_bindings 
makes keybind system automatically generate anti-collision keybinds where necessary to avoid unintentional macro fires
 2020-12-15 21:24:30 +00:00
silicons
4a30064a2c Update saved_circuits.dm 2020-12-15 14:09:44 -07:00