Commit Graph

35801 Commits

Author SHA1 Message Date
Iatots e81d1abf03 Add files via upload 2020-07-23 20:15:48 +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 2ddd2942b9 Add files via upload 2020-07-23 19:54:34 +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
CitadelStationBot 4917fe378a Automatic changelog generation for PR #12828 [ci skip] 2020-07-23 12:35:33 -05: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
CitadelStationBot 278c913976 Automatic changelog generation for PR #12869 [ci skip] 2020-07-23 12:29:46 -05: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
CitadelStationBot b623fb1699 Automatic changelog generation for PR #12867 [ci skip] 2020-07-23 12:29:33 -05:00
silicons 3c5aa67eef Merge pull request #12867 from EmeraldSundisk/omega717
Expands OmegaStation's medical wing.
2020-07-23 10:29:29 -07:00
CitadelStationBot b9ab8d0347 Automatic changelog generation for PR #12866 [ci skip] 2020-07-23 12:29:22 -05:00
silicons 9392eb3bb1 Merge pull request #12866 from Sneakyrat6/snaxiTypo
Fixes Snaxi DMM Typos
2020-07-23 10:29:19 -07:00
CitadelStationBot bb1056b8fd Automatic changelog generation for PR #12860 [ci skip] 2020-07-23 12:29:13 -05:00
silicons aeb6688bc7 Merge pull request #12860 from Sneakyrat6/burnablePhoto
Allows Photos to be Burned
2020-07-23 10:29:10 -07:00
CitadelStationBot 8231d2fbf1 Automatic changelog generation for PR #12861 [ci skip] 2020-07-23 12:28:56 -05:00
silicons 11a4dfd20b Merge pull request #12861 from Sneakyrat6/dresserFix
Fixes dressers not giving you undies
2020-07-23 10:28:54 -07:00
CitadelStationBot f0986c915c Automatic changelog generation for PR #12856 [ci skip] 2020-07-23 12:28:47 -05: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
CitadelStationBot 3f31f5f65c Automatic changelog generation for PR #12854 [ci skip] 2020-07-23 12:26:58 -05:00
silicons d520eaa0ad Merge pull request #12854 from Zandario/tipes
tipes
2020-07-23 10:26:55 -07:00
CitadelStationBot 678a1d0a49 Automatic changelog generation for PR #12816 [ci skip] 2020-07-23 12:25:29 -05: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
Changelogs ed25929fec Automatic changelog compile [ci skip] 2020-07-23 00:10:46 +00:00
timothyteakettle a5945d3dc2 slight zombie tweaking 2020-07-23 01:09:09 +01:00
EmeraldSundisk 29023f9522 Add files via upload 2020-07-22 16:49:40 -07:00
EmeraldSundisk f422ffb998 Update OmegaStation.dmm 2020-07-22 15:24:20 -07:00
Sneakyrat6 1a641231a9 Fixes Snaxi DMM Typos 2020-07-22 16:20:32 -05:00
CitadelStationBot cf91303290 Automatic changelog generation for PR #12855 [ci skip] 2020-07-22 13:41:52 -05: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
CitadelStationBot f9e7d9dd6f Automatic changelog generation for PR #12835 [ci skip] 2020-07-22 04:31:25 -05: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 e1afca8617 Merge pull request #12845 from YakumoChen/MKUltra-Fix
Mk ultra fix
2020-07-22 02:30:43 -07:00
CitadelStationBot dff4e13ddd Automatic changelog generation for PR #12847 [ci skip] 2020-07-22 04:30:35 -05:00
silicons a22c6b21c4 Merge pull request #12847 from Putnam3145/faster-chat
Chat queue optimization
2020-07-22 02:30:31 -07:00
zerothebigboy 9f657a2030 a 2020-07-22 04:17:20 -04:00
zerothebigboy 1d6e0e3a16 a 2020-07-22 04:15:21 -04: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
CitadelStationBot 7c53135650 Automatic changelog generation for PR #12851 [ci skip] 2020-07-21 21:20:56 -05:00
silicons 744b6d6b48 Merge pull request #12851 from zeroisthebiggay/fetishcontentfetishcontent
maid fetish content pr
2020-07-21 19:20:52 -07:00
zerothebigboy f875d6401a a 2020-07-21 21:35:38 -04: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 86ba14a30c a 2020-07-21 21:10:35 -04:00
Changelogs 8b170ec840 Automatic changelog compile [ci skip] 2020-07-22 00:10:20 +00:00
zerothebigboy 75c87077ec a 2020-07-21 17:22:35 -04:00