Commit Graph
23591 Commits
Author SHA1 Message Date
LinandGitHub 69c3d4f24a Merge pull request #12864 from Citadel-Station-13/silicons-patch-45
regarding changelings
2020-07-23 13:18:55 -05:00
LinandGitHub cdd509479e Merge pull request #12868 from Citadel-Station-13/silicons-patch-46
regarding manifest injections
2020-07-23 13:18:35 -05:00
IatotsandGitHub 80f2766314 Update plushes.dm 2020-07-23 20:11:29 +02:00
Timothy Teakettle 5463673831 fuck 2020-07-23 19:02:50 +01:00
IatotsandGitHub 967dfb7bc4 Update other_reagents.dm 2020-07-23 19:59:08 +02:00
Timothy Teakettle 673188bc7e please show the hat 2020-07-23 18:57:24 +01:00
IatotsandGitHub 9d89158fda Update cuts.dm 2020-07-23 19:48:41 +02:00
Timothy Teakettle b18356c95d requested changes 2020-07-23 18:47:34 +01:00
IatotsandGitHub 3dac7e4b43 Update generic_positive_events.dm 2020-07-23 19:44:02 +02:00
siliconsandGitHub 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
siliconsandGitHub 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
siliconsandGitHub 55754023ba Update gas_mixture.dm 2020-07-23 10:32:21 -07:00
siliconsandGitHub dad3d38933 Merge pull request #12869 from timothyteakettle/zombies-rework
the very much needed zombie buffs
2020-07-23 10:29:43 -07:00
siliconsandGitHub aeb6688bc7 Merge pull request #12860 from Sneakyrat6/burnablePhoto
Allows Photos to be Burned
2020-07-23 10:29:10 -07:00
siliconsandGitHub 11a4dfd20b Merge pull request #12861 from Sneakyrat6/dresserFix
Fixes dressers not giving you undies
2020-07-23 10:28:54 -07:00
siliconsandGitHub 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
siliconsandGitHub d520eaa0ad Merge pull request #12854 from Zandario/tipes
tipes
2020-07-23 10:26:55 -07:00
siliconsandGitHub 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
siliconsandGitHub 8a9d806d04 Update client_procs.dm 2020-07-23 08:12:48 -07:00
Timothy Teakettle 2290823ace fixes hat removal 2020-07-23 14:40:36 +01:00
siliconsandGitHub 697cef017b Update living.dm 2020-07-22 23:43:57 -07:00
siliconsandGitHub d976e2186c Merge branch 'master' into drag 2020-07-22 23:43:09 -07:00
timothyteakettle a5945d3dc2 slight zombie tweaking 2020-07-23 01:09:09 +01:00
siliconsandGitHub 66e4d98141 Update datacore.dm 2020-07-22 16:59:51 -07:00
siliconsandGitHub 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
siliconsandGitHub e0e2cd561a Update revive.dm 2020-07-22 11:38:26 -07:00
timothyteakettle a155f24253 let santa hat go on 2020-07-22 16:53:51 +01:00
timothyteakettle a607130e3c please compile 2020-07-22 16:24:35 +01:00
timothyteakettle ed1e8c4221 support for masks 2020-07-22 15:43:58 +01:00
timothyteakettle 0ccbe0b793 it works 2020-07-22 14:49:22 +01:00
siliconsandGitHub 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
siliconsandGitHub a22c6b21c4 Merge pull request #12847 from Putnam3145/faster-chat
Chat queue optimization
2020-07-22 02:30:31 -07:00
siliconsandGitHub 0acf7b82d5 Update revive.dm 2020-07-22 02:20:10 -07:00
siliconsandGitHub 919edfa2fd Update revive.dm 2020-07-22 02:11:20 -07:00
siliconsandGitHub 30e7483e89 Update absorb.dm 2020-07-22 02:10:24 -07:00
siliconsandGitHub 9fc669b4ea Update changeling.dm 2020-07-22 02:09:49 -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
siliconsandGitHub 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
timothyteakettle 6a4264085c woops 2: electric boogaloo 2020-07-22 00:17:03 +01:00
timothyteakettle 0706ac9d2a woops 2020-07-22 00:14:26 +01:00
timothyteakettle 6891bff9d3 further emotes 2020-07-22 00:07:15 +01:00
timothyteakettle 3a520bba3f more hats 2020-07-21 23:45:04 +01:00
Timothy Teakettle 5c88253f93 lots more hats 2020-07-21 22:58:13 +01: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
Timothy Teakettle 0942b46796 more fashions 2020-07-21 18:43:58 +01:00