cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-11 18:33:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
39,947 Commits 55 Branches 0 Tags
318f8ac3d10f0362d1a96e3a69643a2c08ebb8fe
Commit Graph

26148 Commits

Author SHA1 Message Date
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
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
Artur
ee9cf20aec Awaken 2020-12-22 00:25:59 +02: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
raspy-on-osu
d3e224d9c1 init 2020-12-21 04:54:19 -05: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
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
silicons
34f6697e81 Merge pull request #13796 from keronshb/fixedscarpchanges 
Scarp Changes and Bundle
 2020-12-20 09:23:20 -07:00
Putnam
4e6abdec74 i wish we both die 2020-12-19 20:51:58 -08:00
Putnam
f9edd8e8ac Made the previous-round weight-adjust based on max instead of average. 2020-12-19 20:34:28 -08:00
Putnam
a3f2ae3333 i'm such an idiot. 2020-12-19 20:27:07 -08:00
Putnam
c47761fa58 Added a DYNAMIC_THREAT_BASELINE config option. 
why didn't i do this sooner
 2020-12-19 19:30:16 -08:00
Putnam
79e71b54e2 Made gear harness adjustable instead of none-cover by default. 2020-12-19 19:01:31 -08:00
Putnam
f840965763 no autotraitor, better logging 2020-12-19 18:04:22 -08:00
Hatterhat
fa799a0ac5 it compiles 2020-12-19 19:02:56 -06:00
Hatterhat
b8b2f34735 funny knife 2020-12-19 18:45:25 -06: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
Putnam
fb31117a8d nah nah none of that. 2020-12-18 22:36:41 -08:00
Putnam
f209fec1ee oh, that's why extended is there 2020-12-18 22:19:40 -08:00
BlueWildrose
98b1de5536 oh yes we don't want that do we? 2020-12-18 22:56:39 -07:00
Xantholne
a5c14b90c5 Adds missing sheathing sounds 2020-12-18 22:56:30 -07:00
Xantholne
d60d72c7b7 Fixes twin belts 
gives item state and icon state to be functional
 2020-12-18 22:03:24 -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
Putnam
5e8f76792e Readjusted weight; added min/max config options 2020-12-18 20:24:30 -08:00
DeltaFire
28da750a55 Merge pull request #13806 from Citadel-Station-13/silicons-patch-30 
adds logging to shell execution
 2020-12-19 04:50:12 +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
e0c1f8f700 Merge pull request #13808 from Putnam3145/polycircuit-sanity 
Polycircuit sanity checking
 2020-12-18 07:46:59 -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