shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
35,794 Commits 5 Branches 0 Tags
9f66163d4f19cde4913eb0bb3fa81cfc3e9e5721
Commit Graph

23494 Commits

Author SHA1 Message Date
silicons
9f66163d4f Merge pull request #12828 from Owai-Seek/foodport-p2-7/12/20 
Ports several food sprites/foods from Baystation/Citadel RP
 2020-07-23 10:35:30 -07:00
silicons
ec72015f4f Merge pull request #12809 from BlackMajor/borgo 
Gripper brained. The medborg can do chemistry now, oh no.
 2020-07-23 10:35:16 -07:00
silicons
dad3d38933 Merge pull request #12869 from timothyteakettle/zombies-rework 
the very much needed zombie buffs
 2020-07-23 10:29:43 -07:00
silicons
aeb6688bc7 Merge pull request #12860 from Sneakyrat6/burnablePhoto 
Allows Photos to be Burned
 2020-07-23 10:29:10 -07:00
silicons
11a4dfd20b Merge pull request #12861 from Sneakyrat6/dresserFix 
Fixes dressers not giving you undies
 2020-07-23 10:28:54 -07:00
silicons
ce87d3e8c5 Merge pull request #12856 from zeroisthebiggay/radiationsuitsareugly 
ports tg radiation suits and also makes syndiekrav gloves actually visually distinct
 2020-07-23 10:28:44 -07:00
silicons
d520eaa0ad Merge pull request #12854 from Zandario/tipes 
tipes
 2020-07-23 10:26:55 -07:00
silicons
9222933d77 Merge pull request #12816 from timothyteakettle/wound-port 
ports part 1 of tg wounds
 2020-07-23 10:25:25 -07:00
Timothy Teakettle
f5ac0b5762 some fixes 2020-07-23 18:10:46 +01:00
timothyteakettle
a5945d3dc2 slight zombie tweaking 2020-07-23 01:09:09 +01:00
silicons
efb4d19a40 Merge pull request #12855 from DeltaFire15/AAAAAAAA 
Unfucks the monophobia traits (Aswell as traits in general) with this one simple trick
 2020-07-22 11:41:48 -07:00
timothyteakettle
0ccbe0b793 it works 2020-07-22 14:49:22 +01:00
silicons
60a25981bc Merge pull request #12835 from kappa-sama/patch-36 
might fix necropolis chests turning up completely empty
 2020-07-22 02:31:21 -07:00
silicons
a22c6b21c4 Merge pull request #12847 from Putnam3145/faster-chat 
Chat queue optimization
 2020-07-22 02:30:31 -07:00
zerothebigboy
7870d90de3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into radiationsuitsareugly 
# Conflicts:
#	icons/mob/clothing/hands.dmi
#	icons/mob/clothing/head.dmi
#	icons/obj/clothing/gloves.dmi
#	icons/obj/clothing/hats.dmi
 2020-07-22 01:03:55 -04:00
silicons
744b6d6b48 Merge pull request #12851 from zeroisthebiggay/fetishcontentfetishcontent 
maid fetish content pr
 2020-07-21 19:20:52 -07:00
Sneakyrat6
402f13ce1b Fixes dressers not giving you undies 2020-07-21 20:33:58 -05:00
Sneakyrat6
2968963f19 Allows Photos to be Burned 2020-07-21 20:20:51 -05:00
zerothebigboy
75c87077ec a 2020-07-21 17:22:35 -04:00
Timothy Teakettle
aea268548c some fixes 2020-07-21 19:54:42 +01:00
DeltaFire
73925501ae I will now proceed to scream internally 
Tabby boi bad
 2020-07-21 20:13:30 +02:00
Zandario
bbf38c9898 tipes 2020-07-21 11:22:21 -05:00
zerothebigboy
7b35c5fd9d a 2020-07-21 02:30:32 -04:00
zerothebigboy
fb35248e3b a 2020-07-21 02:24:22 -04:00
Putnam
3faa9d6f13 Chat queue optimization. 
To be exact, makes it only do the expensive text replacement when there's a client to receive the text.
 2020-07-20 19:58:44 -07:00
kappa-sama
c92abfe2ce bruh 2020-07-20 21:18:39 -04:00
silicons
aa3cc9fae8 Merge pull request #12824 from kappa-sama/patch-35 
makes brainwashing disk role restricted and debuffs its price
 2020-07-20 17:25:53 -07:00
Timothy Teakettle
75a2035774 Merge branch 'master' into wound-port 2020-07-21 01:10:51 +01:00
Lin
b6f689b06d Merge pull request #12843 from Citadel-Station-13/silicons-patch-40 
uhhhhhhh ok nothing to see here let's fix spell packets this time again
 2020-07-20 19:05:28 -05:00
silicons
3d2995b4e8 Merge pull request #12787 from CameronWoof/advanced-sutures-and-mesh 
Ports Medicated Sutures and Advanced Regenerative Mesh from TG
 2020-07-20 17:01:32 -07:00
silicons
a7144d2404 Merge pull request #12829 from timothyteakettle/fried-component 
the fried component
 2020-07-20 16:59:36 -07:00
silicons
7df369e5d7 Merge pull request #12811 from kappa-sama/patch-33 
removes the 2 best weapons in the game from traitor uplink's 10tc surgery bag
 2020-07-20 16:58:01 -07:00
silicons
1d99591b6b Merge pull request #12807 from kappa-sama/patch-32 
lowers stray cargo pod weight from 2x normal to 1/2 normal
 2020-07-20 16:57:24 -07:00
silicons
9bb92f8d4d Merge pull request #12805 from SiliconMain/patch-1 
This is stupid
 2020-07-20 16:56:57 -07:00
silicons
3f2cab02eb Merge pull request #12826 from Kraseo/instastuns-bad 
Makes damp rags no longer instantly apply chemicals
 2020-07-20 16:56:22 -07:00
silicons
947b050c47 Merge pull request #12804 from Arturlang/decal_painter_fix 
Decal Painter ui fix
 2020-07-20 16:55:38 -07:00
silicons
c7022445b5 Merge pull request #12800 from DeltaFire15/swarmer-fix 
Fixes swarmers not being able to eat any items at all
 2020-07-20 16:55:00 -07:00
silicons
fefc0530b8 Merge pull request #12795 from TheSpaghetti/patch-3 
Makes extradimensional oranges weirder. [/TG/ PORT]
 2020-07-20 16:54:43 -07:00
silicons
448706d540 Merge pull request #12749 from TheSpaghetti/patch-2 
Adds monophobia quirk.
 2020-07-20 16:54:25 -07:00
silicons
4d4133a8da Merge pull request #12819 from Arturlang/bloodsucker_typo 
Fixes a bloodsucker lair typo
 2020-07-20 16:53:42 -07:00
silicons
2ec64f3e05 Update wizard.dm 2020-07-20 16:50:56 -07:00
Lin
210b7b281c Merge pull request #12727 from Citadel-Station-13/silicons-patch-19 
bandaids around turnstiles being bad code until it can have its movement checks refactored
 2020-07-20 18:25:01 -05:00
Lin
7adae61ade Merge pull request #12773 from Citadel-Station-13/silicons-patch-28 
jexp exemption now also exempts from antag days remaining locks
 2020-07-20 18:22:42 -05:00
Lin
923b4cbb4f Merge pull request #12823 from Citadel-Station-13/gravity_update 
gravity now immediately updates on entering/exiting areas with different gravity and space meaning no more slow for 4 seconds while in a hardsuit and then fast with jetpack
 2020-07-20 18:21:55 -05:00
Lin
f0df3689dc Merge pull request #12790 from Citadel-Station-13/silicons-patch-30 
truncates sdql2 output to 2500 objects instead of 20000 because it's a real epic gamer moment when admins crash their clients doing SELECT /datum/gas_mixture
 2020-07-20 18:20:27 -05:00
Lin
67a6330e77 Merge pull request #12786 from silicons/survivalists 
makes survivalists pseudoantags again and limits summon guns/magic to one use
 2020-07-20 18:20:08 -05:00
Lin
f7355dde62 Merge pull request #12728 from silicons/vote 
"I didn't see the map vote" - Adds a stat vote panel for plurality and approval voting as an alternative to the regular popups.
 2020-07-20 18:17:45 -05:00
silicons
267186a5d3 Merge pull request #12646 from Chiirno/emi 
[READY] Alt-click cigarette pack functionality added to pill bottles.
 2020-07-20 16:15:38 -07:00
kappa-sama
3676b03f28 experiment 2020-07-20 14:53:22 -04:00
Timothy Teakettle
4b70e29e36 let the fry smite work 2020-07-20 19:42:07 +01:00