shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
44,773 Commits 5 Branches 0 Tags
4e91dde6b0528879e272cd79780d807fdc591a4c
Commit Graph

29075 Commits

Author SHA1 Message Date
keronshb
4e91dde6b0 Timer fix and dead list removal 2021-09-30 14:50:04 -04:00
keronshb
fa193aabfa End Report threat 2021-09-30 14:43:13 -04:00
keronshb
5868c90fe8 Wizard fixes 2021-09-27 22:28:44 -04:00
keronshb
eb548eb9b3 Fixes antag prefs breaking 2021-09-27 20:03:42 -04:00
keronshb
3bda0e9015 Pirate fix 2021-09-26 21:00:48 -04:00
keronshb
5da5ac396c Head blacklist for antag 2021-09-26 14:29:46 -04:00
keronshb
af2777a604 Citadel weight adjustments and config 2021-09-25 17:56:15 -04:00
keronshb
fb5653e12c Voting fix 2021-09-25 12:59:18 -04:00
keronshb
a6bfff92cc Fixes pirates, re adds extended, re adds voting 2021-09-24 19:40:56 -04:00
keronshb
cbe221e18f Adds more blackbox stuff 2021-09-23 19:57:51 -04:00
keronshb
c9697f4bbf Fixes dynamic 2021-09-23 19:38:15 -04:00
keronshb
c8814e8cc8 Merge remote-tracking branch 'upstream/master' into dynamicport 2021-09-19 18:09:18 -04:00
keronshb
cd00d1589e fucking hell 2021-09-19 18:06:24 -04:00
keronshb
13323d2597 Merge branch 'master' into dynamicport 2021-09-19 17:59:09 -04:00
keronshb
0b5a7c9759 OOPS FORGOT PIRATES and some blacklists 2021-09-19 17:56:26 -04:00
zeroisthebiggay
7fce515ca4 Update robot_modules.dm 2021-09-19 16:01:29 -04:00
zeroisthebiggay
4ab88cfcdb Update robot_modules.dm 2021-09-19 15:59:45 -04:00
zeroisthebiggay
2f903353a6 Update robot_modules.dm 2021-09-19 15:56:40 -04:00
zerothebigboy
c6ce359cda Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum 
# Conflicts:
#	tgstation.dme
 2021-09-19 15:23:52 -04:00
silicons
c60e54e0d3 Merge pull request #15074 from keronshb/paiports 
PORTS PAI Emag Act
 2021-09-19 11:12:02 -07:00
silicons
c4386c0a4f Merge pull request #15175 from buffyuwu/hallucination 
meme pr that adds a hallunciation sound
 2021-09-19 11:11:05 -07:00
silicons
f48bf3cdc0 Merge pull request #15174 from buffyuwu/holoparasites 
probably fixes holoparasites
 2021-09-19 11:10:45 -07:00
silicons
8d914571e8 Merge pull request #15094 from zeroisthebiggay/patch-20 
removes building (fortnite) windows
 2021-09-19 11:09:55 -07:00
silicons
a40acd3cd6 Merge pull request #15176 from buffyuwu/dogborgsleeper 
fixes dogborg sleepers not working
 2021-09-19 11:09:06 -07:00
silicons
97213c94d8 Merge pull request #15178 from zeroisthebiggay/soup 
all medipens get inhands
 2021-09-19 11:09:01 -07:00
silicons
ae1b7803fa Merge pull request #15172 from Putnam3145/bonfire-always-works-lavaland 
Massively reduced oxygen req for bonfire
 2021-09-19 11:08:56 -07:00
silicons
9a393e07f8 Merge pull request #15171 from DeltaFire15/ventcrawl-I-want-to-cry 
Hey raspy why can plastic golems ventcrawl even with equipment?
 2021-09-19 11:08:45 -07:00
silicons
a6637584a7 Merge pull request #15169 from timothyteakettle/REDACTED 
adds a new mild trauma
 2021-09-19 11:08:40 -07:00
silicons
54993928b2 Merge pull request #15167 from BlueWildrose/regenerativenerf 
Xenobio regenerative extract nerfing - Hold still for 5 seconds to use on others, 1 second for self, adds stackable disgust when used
 2021-09-19 11:08:10 -07:00
keronshb
1f71740803 . 2021-09-19 14:08:01 -04:00
silicons
9ac585c7f4 Merge pull request #15166 from Putnam3145/wider-effective-temperature 
Supermatter has capped effective temperature for power increase too
 2021-09-19 11:07:45 -07:00
silicons
abb89d9af0 Merge pull request #15163 from buffyuwu/clothing 
saltpr adding more suit slot clothing
 2021-09-19 11:07:32 -07:00
silicons
2bf73138fa Merge pull request #15157 from DeltaFire15/nanite-storage 
Storage nanite designs are no longer inaccessible
 2021-09-19 11:07:13 -07:00
silicons
1c22d85061 Merge pull request #15158 from SandPoot/obscured-slots 
Adds obscured slots and TRAIT_NODROP checks to the outline system
 2021-09-19 11:07:08 -07:00
silicons
9d02cf4734 Merge pull request #15160 from timothyteakettle/xor-update 
removes passkey from access circuits as it's not used anymore
 2021-09-19 11:07:02 -07:00
silicons
df4732a6e6 Merge pull request #15161 from timothyteakettle/prefbreaking-is-bad 
the mind transfer spell now releases people from vore bellies prior to the mind transfer
 2021-09-19 11:06:51 -07:00
silicons
35948bec02 Merge pull request #15162 from zeroisthebiggay/patch-23 
prisoners cannot latejoin anymore
 2021-09-19 11:06:40 -07:00
silicons
e50125ca6b Merge pull request #15150 from Putnam3145/hacked-law-self-qdel 
Makes special objective items delete on reroll
 2021-09-19 11:06:29 -07:00
silicons
c04f0cb953 Merge pull request #15154 from qweq12yt/test 
[Fix] Fixes Space Heater behavior
 2021-09-19 11:06:15 -07:00
silicons
6db4fc303f Merge pull request #15147 from Putnam3145/monstermos-config 
Adds a config entry for monstermos (disabled for now)
 2021-09-19 11:06:00 -07:00
silicons
a1e27f9ad6 Merge pull request #15144 from zeroisthebiggay/spiteful 
bone satchel onmob sprites
 2021-09-19 11:05:18 -07:00
silicons
ffa1355a33 Merge pull request #15139 from DeltaFire15/catsurgeon-badspawn 
The cat surgeon event now prefers using "safe" turfs as spawn location
 2021-09-19 11:04:59 -07:00
silicons
c16f29ffb2 Merge pull request #15137 from DeltaFire15/clockcult-ai-conversion 
Allows clock cultists to convert carded AIs by placing their card onto a conversion sigil
 2021-09-19 11:04:50 -07:00
silicons
d90483c428 Merge pull request #15119 from keronshb/slaughterbuff 
Fixes Slaughter Demon, gives it an action button, and a slight buff
 2021-09-19 11:03:18 -07:00
silicons
1bc24575d4 Merge pull request #15084 from keronshb/plaguefix 
Fixes Plague Rats + other buffs
 2021-09-19 11:03:05 -07:00
keronshb
6cc4e35b44 Mob lists 2021-09-19 13:28:41 -04:00
buffyuwu
8a207d7ebd three more loadout clothing items 
made from (many) edits to the gothcoat and blackwizard clothing items respectively
 2021-09-19 03:01:02 -04:00
zerothebigboy
4c82eeeb2a soup 2021-09-18 18:18:04 -04:00
timothyteakettle
c506289e6f removes remaining references 2021-09-18 14:24:20 +01:00
timothyteakettle
366bab9dbf removes the passkey 2021-09-18 10:47:50 +01:00