shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
45,021 Commits 5 Branches 0 Tags
bd7a2b6a2a1663f93685c76670306e21de6b16dd
Commit Graph

6170 Commits

Author SHA1 Message Date
keronshb
bd7a2b6a2a Lets families compile 2021-10-12 16:12:38 -04:00
keronshb
41013ec815 Part 2 - Missing stuff from original families port 2021-10-12 12:07:02 -04:00
keronshb
0bae06adcd Original Port 2021-10-11 22:00:54 -04:00
Timothy Teakettle
11df2bb77c fixes emps not working on lockers (#15259) 
* Update closets.dm

* Update code/game/objects/structures/crates_lockers/closets.dm

Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>

Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
 2021-10-11 00:48:00 +02:00
Lin
2085279590 Merge pull request #15252 from SandPoot/tooltip-related-fixes 
Tooltip related fixes
 2021-10-08 22:31:23 -07:00
SandPoot
3de08a74e7 Upload files 2021-10-07 12:32:20 -03:00
Putnam3145
fedf409a5d Merge pull request #15105 from Citadel-Station-13/silicons-patch-7 
comedically controversial stunbaton """"buff""""
 2021-10-07 00:05:45 -07:00
Putnam3145
8be5dba86a Merge pull request #15127 from Citadel-Station-13/silicons-patch-14 
chaplain runspeed holy weapon will now only give a random slowdown/speedup of 6 tiles which for the most part ignores all other slowdowns/speedups, instead of randomizing between slowing to a crawl and running faster than the speed of light
 2021-10-07 00:05:24 -07:00
Chayse Ramsay
76fa85e683 Cyborg module sorting fixed (#15241) 2021-10-06 17:16:10 +02:00
Lin
8f9a2b6d0c Merge pull request #15235 from silicons/pai_radio_Stuff 
redoes how pai emp silencing works
 2021-10-05 12:32:23 -07:00
Lin
b18fbe695a Merge pull request #15233 from SandPoot/misc-fixes 
Some random fixes
 2021-10-05 10:27:19 -07:00
silicons
bac7bc3fb6 fix 2021-10-03 11:29:32 -07:00
SandPoot
1c80169f22 Update shields.dm 2021-10-02 22:35:54 -03:00
SandPoot
95b814d47e Upload files 2021-10-02 22:29:01 -03:00
WanderingFox95
83987db48a Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul 2021-10-01 18:51:46 +02:00
silicons
5ff4a2ace5 Merge pull request #15180 from LetterN/achives- 
Achivement & Clowncar update
 2021-09-28 00:15:52 -07:00
WanderingFox95
d8aa29a16e Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul 2021-09-21 14:49:15 +02:00
Lin
ab7b4e3eec Merge pull request #15181 from Citadel-Station-13/typecaches 
no more powergaming dice bags
 2021-09-20 23:59:53 -05:00
Lin
7a5e748344 Merge pull request #15185 from Citadel-Station-13/silicons-patch-6 
fixes airlock deflection
 2021-09-20 23:53:53 -05:00
WanderingFox95
c99df01c87 Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul 2021-09-20 00:16:27 +02:00
silicons
6d99bca184 Update obj_defense.dm 2021-09-19 14:46:09 -07:00
silicons
84a26eeabd Update obj_defense.dm 2021-09-19 14:45:24 -07:00
WanderingFox95
fe8a652689 Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul 2021-09-19 21:32:03 +02: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
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
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
147903f654 sigh 2021-09-19 10:57:58 -07:00
LetterN
0b7e514739 t 2021-09-19 14:05:28 +08:00
buffyuwu
b9b8e32860 fixes dogborg sleepers not working 
closes #15142
 2021-09-18 05:29:42 -04:00
SandPoot
382473eb88 Thicc 2021-09-17 14:15:39 -03:00
SandPoot
f61c505bbf Glued items too 2021-09-16 01:37:05 -03:00
SandPoot
456f68b32b Upload files 2021-09-16 01:05:28 -03:00
zerothebigboy
3c60632312 spiteful 2021-09-14 11:01:20 -04:00
silicons
d2f3ff4d11 Update holy_weapons.dm 2021-09-12 20:23:00 -07:00
silicons
57b6946fbb Update holy_weapons.dm 2021-09-12 20:18:48 -07:00
silicons
037f466a47 Update holy_weapons.dm 2021-09-12 20:12:31 -07:00
silicons
aa7a376dd5 removes DoT 2021-09-12 20:10:01 -07:00
silicons
7aae90a360 Update holy_weapons.dm 2021-09-12 20:05:47 -07:00
silicons
baa8d26428 Update holy_weapons.dm 2021-09-12 20:03:26 -07:00
silicons
c038529677 Update holy_weapons.dm 2021-09-12 19:55:20 -07:00
zerothebigboy
68e2eb1d7a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into prisoners 2021-09-10 12:12:57 -04:00
silicons
c600fae409 Merge pull request #15103 from SandPoot/cyborg-grippers 
Does some nice stuff on cyborg grippers
 2021-09-09 17:59:47 -07:00
silicons
52029c6067 Update stunbaton.dm 2021-09-08 20:53:52 -07:00
silicons
5bf71cdcc8 Update stunbaton.dm 2021-09-08 20:43:10 -07:00
silicons
69bd477a72 Merge pull request #15039 from keronshb/gradiantport 
Ports Colorist Quirk and Hair Gradients Preferences
 2021-09-08 20:41:00 -07:00
silicons
bb7ee63eae Merge pull request #15058 from zeroisthebiggay/headass 
the unatomized hypospray/medbay tools/emergency kits resprite
 2021-09-08 20:40:20 -07:00
SandPoot
37e2470616 Upload files 2021-09-08 19:53:47 -03:00
zerothebigboy
3c23a09b56 bannedforbeingcringeist 2021-09-07 21:10:24 -04:00
zeroisthebiggay
70b0dad62d Update glass.dm 2021-09-07 03:26:39 -04:00