fc9b99173b
Merge pull request #7344 from LetterN/fix-1
...
fixes lewd handcuffs
2018-07-10 01:59:36 -04:00
c1ae3a7ba6
fixes democracy
2018-07-07 14:10:32 -04:00
5c79a794ec
Update holy_weapons.dm
2018-07-06 17:20:30 +08:00
bff55cc362
Update handcuffs.dm
2018-07-06 17:19:56 +08:00
981743a170
Update custom_items.dm
2018-07-06 00:54:21 -05:00
5ad7fc35fd
Update __donator.dm
2018-07-06 00:54:01 -05:00
a64dba6270
Merge branch 'flagcape'
...
# Conflicts:
# icons/obj/custom.dmi
# modular_citadel/code/modules/client/loadout/__donator.dm
# modular_citadel/code/modules/custom_loadout/custom_items.dm
2018-07-06 00:51:42 -05:00
b245b940a4
Update custom_items.dm
2018-07-06 00:46:48 -05:00
5cacbfbe2e
Merge branch 'flagcape' of https://github.com/Citadel-Station-13/Citadel-Station-13 into flagcape
...
# Conflicts:
# modular_citadel/code/modules/custom_loadout/custom_items.dm
2018-07-06 00:45:52 -05:00
637c64f55b
fuk
2018-07-06 00:42:25 -05:00
5f4e19000d
Merge pull request #7308 from Citadel-Station-13/kevinz000-patch-9
...
protects load_mentors from accidental wipe due to advproccall interrupting sql operations
2018-07-06 01:40:20 -04:00
034a7da744
Merge pull request #7029 from Citadel-Station-13/kitsundevilwings
...
Adds devilwings donor item for kitsun
2018-07-06 00:40:00 -05:00
cec2871db2
Merge pull request #7293 from LetterN/patch-4
...
fixes kinkmate
2018-07-06 01:36:15 -04:00
5924595c8d
adds icon_override
2018-07-06 00:48:21 -04:00
8e0a1a64af
oops
2018-07-05 23:44:44 -05:00
f8828db041
donator cape
2018-07-05 23:43:47 -05:00
759dddb821
Fixes signals
2018-07-05 01:42:05 -04:00
ac6fddcfb3
Merge remote-tracking branch 'upstream/master' into hopefullythefinalhardsync
2018-07-05 00:17:44 -04:00
cc628a905e
two major fixes - fixes flavortext and right click exploit
2018-07-04 16:41:55 -04:00
abc32ed0df
adds "cap's female formal outfit" ( #7307 )
...
* Update under.dm
* modifies cit_clothes.dmi
* Updates uniforms.dmi
* Update security.dm
* now wont remove other clothing stuff (TM)
* Add files via upload
* Update under.dm
2018-07-04 05:37:01 -07:00
80f8f7e1b1
Update mentor.dm
2018-07-03 06:33:33 -07:00
f986f9c9f2
makes it compile. should work. hopefully
2018-07-02 15:35:11 -04:00
493a356338
Update machine_circuitboards.dm
2018-07-02 09:13:28 +00:00
5c2b858e4c
Merge pull request #7228 from improvedname/rubber-shot-edition!
...
adds rubbershot versions for sec rifless
2018-06-26 14:08:25 -04:00
4d79c5ef09
Merge pull request #7110 from Michiyamenotehifunana/Random-Donator-Thing-1
...
Adds the Not-Nanotrasen Corporate Uniform and a Silver Bike Horn
2018-06-26 14:06:32 -04:00
293f484535
Merge pull request #7108 from Citadel-Station-13/kevinz000-patch-9
...
removes magicarp from gold cores
2018-06-26 14:05:43 -04:00
be532c5c7f
Merge pull request #7079 from Citadel-Station-13/kevinz000-patch-7
...
hopefully fixes kinkmates dropping boozeomat parts
2018-06-26 14:04:27 -04:00
0d522533b7
Merge pull request #7078 from Michiyamenotehifunana/powercrepe-in-nam
...
Adds a tiny "pocket" to the M1 Helmet (flak helmet)
2018-06-26 14:04:13 -04:00
7dec7223c2
rubber2
2018-06-23 15:06:36 +02:00
110c53b724
rubberoo
2018-06-23 14:48:00 +02:00
aee56b1f3d
lets dogborg tongues reduce firestacks when they lick faces ( #7148 )
2018-06-18 11:53:59 -07:00
27b6ebc612
Cw's Spaceruins, Maintbar and Kegspawn changes ( #7141 )
...
* Station Changes
-Added Jukebox to: Box (maintbar), Meta (maintbar), Pubby (maintbar),
and Omega (maintarcade)
-Added keg spawn to Pubby
-Removed Legcuffs and Rifle Stock from Box maintbar (people were unhappy
with the fact these were sprited identically to handcuffs, will re-add
if someone ports Virgo's legcuffs)
* Space Ruins Changes
-Added KinkMates to SpaceHotel
-Swapped riot helmet for AI detecting multitool on TurretedOutpost
-Changed the loot for oldAIsat to not have a suspicious toolbox, instead
having a toolbelt and combat gloves
* Kegspawn Change
Changed Spawn Rate of kegs to:
-50% mead (5 in 10 instead of 5 in 8)
-20% aphro (2 in 10 instead of 1 in 8)
-20% strong aphro (2 in 10 instead of 1 in 8)
-10% pan galactic gargle blaster (1 in 10 instead of 1 in 8)
* Small MetaStation Fixes
Fixed bug reported by Nethaufer (Zig)#5868 on discord, there was a wire
(and an air supply pipe) accidentally deleted.
2018-06-18 11:52:11 -07:00
5813950aff
fixes shock collars
2018-06-18 14:28:43 +08:00
842b64646b
Update custom_items.dm
2018-06-17 05:44:13 -04:00
e4e0e0d91d
Adds random things for Jay to do things with
2018-06-15 13:50:15 +08:00
a9100a89a6
modularize
2018-06-14 15:35:25 -07:00
901dd94253
Corrects climax cooldown timer message, makes relieve message pronounsensitive ( #7086 )
2018-06-13 19:27:19 -07:00
e86c48b7a2
Update vending.dm
2018-06-12 03:51:03 -07:00
b62b9de0c1
Adds a tiny "pocket" to the M1 Helmet
2018-06-12 16:02:25 +08:00
5189199b50
Merge branch 'master' into kitsundevilwings
2018-06-12 07:57:15 +00:00
ecd200a5bc
Merge pull request #7043 from Cw3040/master
...
Small Cryosleeper Bug Fix and Box Map Fix
2018-06-12 03:16:40 +00:00
a6966e2a97
Adds a (mostly) cosmetic flak jacket and helmet ( #7045 )
2018-06-10 12:31:54 -07:00
108ff89719
Dark Carapace - Donator Item ( #7055 )
...
* donator
* POWERGAME
2018-06-10 12:28:58 -07:00
8169c9256f
bumps the sprite down by 1 pixel. grrmbl rmbl rmbl
2018-06-09 02:02:53 -04:00
93b97528c0
Fixing my syntax errors
...
to make travis not yell at me
2018-06-08 14:48:27 -04:00
dee92640a8
Cryosleeper Bug Fix
...
Adds Cyborg weapon modules to var/list/do_not_preserve_items for
Cryosleepers, hopefully eliminating a bug where borg gun modules drop on
cryosleep.
2018-06-08 14:33:40 -04:00
303d939116
Adds devilwings donor item for kitsun
2018-06-07 00:27:23 -04:00
4076078210
Adds table slamming as a right click interaction for tables ( #7006 )
...
* Adds table slamming as a right click interaction for tables
* and the DME, too. fuck.
* fixes compiling errors
2018-06-05 11:16:17 -07:00
1042fa8ff1
Adds @CitadelBot wheelofsalt command ( #7005 )
...
* adds the wheel of salt chat command to tgs3
* fuck i missed a couple things
2018-06-05 11:15:51 -07:00
26a24e49b7
Update __donator.dm
2018-06-03 09:02:44 -05:00
deathride58