deathride58 742d50b5e7 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into donoritemmodularization ...

# Conflicts:
#	code/citadel/custom_loadout/custom_items.dm
#	code/datums/components/riding.dm
#	code/game/objects/items/implants/implantuplink.dm
#	icons/mob/neck.dmi
#	icons/obj/clothing/cloaks.dmi

2017-12-08 19:58:41 -05:00

..

crew_objectives

Update cit_crewobjectives_science.dm

2017-11-17 23:45:20 -05:00

custom_loadout

Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into donoritemmodularization

2017-12-08 19:58:41 -05:00

icons

adjusts how boobs look sprite wise

2017-11-22 02:39:46 -06:00

organs

Climaxing/masturbation changes, exposing through clothing, breastmilk and masturbation (#2357)

2017-08-19 19:01:02 -07:00

toys

here we go again (#2456)

2017-08-24 19:24:25 -07:00

_cit_helpers.dm

Update _cit_helpers.dm

2017-11-18 00:23:19 -05:00

cit_areas.dm

adds clown and mime offices, adds abandoned cafe, makes maint bar all access

2017-10-08 17:26:00 -04:00

cit_arousal.dm

here we go again (#2456)

2017-08-24 19:24:25 -07:00

cit_clothes.dm

Security Skirts and more!

2017-11-04 10:22:45 +08:00

cit_crewobjectives.dm

cleans up comments

2017-10-11 18:26:10 -04:00

cit_displaycases.dm

tons of map changes to go around

2017-11-04 00:55:56 -04:00

cit_emotes.dm

Re-enables slime emote

2017-07-20 23:33:26 +02:00

cit_genemods.dm

goddamnit_again (#2511)

2017-08-26 18:43:57 -07:00

cit_guns.dm

Update cit_guns.dm

2017-11-24 12:50:46 -08:00

cit_kegs.dm

The Update (#241)

2017-02-24 21:42:15 -05:00

cit_miscreants.dm

drunk coding is a horrible idea

2017-10-26 22:54:49 -04:00

cit_reagents.dm

tfw autotab

2017-10-15 19:28:03 -04:00

cit_spawners.dm

Fixes Gamemode Voting & Map Edits (#1937)

2017-07-07 17:54:53 -04:00

cit_uniforms.dm

Icon_override, Plasma weapon tweaks & gunlocker. AK-47 Summoning (#2759)

2017-09-16 04:29:22 -05:00

cit_vendors.dm

Icon_override, Plasma weapon tweaks & gunlocker. AK-47 Summoning (#2759)

2017-09-16 04:29:22 -05:00

cit_weapons.dm

massive overhaul of RGB stuff and massive additions

2017-12-02 00:06:42 +08:00

discordbot.dm

Tg patch branch to master (#192)

2017-02-03 05:56:14 -06:00

dogborgs.dm

here we go again (#2456)

2017-08-24 19:24:25 -07:00

dogborgstuff.dm

Bhijn's touching dogborg balance again everyone panic (#3432)

2017-10-24 22:04:51 -05:00

plasmacases.dm

Icon_override, Plasma weapon tweaks & gunlocker. AK-47 Summoning (#2759)

2017-09-16 04:29:22 -05:00

pokemon.dm

here we go again (#2456)

2017-08-24 19:24:25 -07:00