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

23510 Commits

Author SHA1 Message Date
Iatots b6437a4ada Update code/game/objects/items/plushes.dm 
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
 2020-07-24 15:23:11 +02:00
Iatots 83c6dc65ba Update code/modules/reagents/chemistry/reagents/other_reagents.dm 
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
 2020-07-24 15:22:56 +02:00
Iatots 2eade6c149 Update code/modules/reagents/chemistry/reagents/other_reagents.dm 
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
 2020-07-24 15:22:38 +02:00
Iatots a9c51fc624 Update other_reagents.dm 2020-07-24 08:40:48 +02:00
Iatots ec2bd9b876 Update plushes.dm 2020-07-24 08:40:25 +02:00
Iatots f53f7c5e92 Update cuts.dm 2020-07-24 07:46:09 +02:00
Iatots 4da365851f up to regulations now. 2020-07-23 21:27:00 +02:00
Iatots 21ef5fb1b7 Update other_reagents.dm 2020-07-23 21:14:46 +02:00
Iatots b2a0d00eee Update plushes.dm 2020-07-23 21:13:41 +02:00
Iatots 554e764be8 Update cuts.dm 
dang speededit
 2020-07-23 21:00:26 +02:00
Iatots a2381755e1 Update cuts.dm 
nomenclature error
 2020-07-23 20:52:29 +02:00
Iatots e6dd213a2a Update recipes_misc.dm 2020-07-23 20:26:11 +02:00
Iatots 80f2766314 Update plushes.dm 2020-07-23 20:11:29 +02:00
Iatots 967dfb7bc4 Update other_reagents.dm 2020-07-23 19:59:08 +02:00
Iatots 9d89158fda Update cuts.dm 2020-07-23 19:48:41 +02:00
Iatots 3dac7e4b43 Update generic_positive_events.dm 2020-07-23 19:44:02 +02:00
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