Centcom Updates 3 Return of the maps (#11974)

* centcom magic

* fuck

* autism

* changelog+
This commit is contained in:
CptWad
2016-09-26 21:42:33 -07:00
committed by clusterfack
parent 99da2a94fc
commit 54007c0a88
5 changed files with 2227 additions and 1219 deletions

View File

@@ -404,6 +404,83 @@
/obj/effect/landmark/corpse/russian/ranged /obj/effect/landmark/corpse/russian/ranged
corpsehelmet = /obj/item/clothing/head/ushanka corpsehelmet = /obj/item/clothing/head/ushanka
//////////////////Admin Use//////////////////////////////
/obj/effect/landmark/corpse/ertleader
name = "Emergency Response Organizer"
corpseuniform = /obj/item/clothing/under/rank/centcom/captain
corpsesuit = /obj/item/clothing/suit/armor/swat/officer
corpseglasses = /obj/item/clothing/glasses/sunglasses/sechud
corpsehelmet = /obj/item/clothing/head/beret/centcom/captain
corpseshoes = /obj/item/clothing/shoes/centcom
corpsebelt = /obj/item/weapon/storage/belt/security
/obj/effect/landmark/corpse/centcom
name = "Central Commander Green"
corpseuniform = /obj/item/clothing/under/rank/centcom_commander
corpseglasses = /obj/item/clothing/glasses/sunglasses/sechud
corpsemask = /obj/item/clothing/mask/cigarette/cigar/cohiba
corpsehelmet = /obj/item/clothing/head/centhat
corpsegloves = /obj/item/clothing/gloves/combat
corpseshoes = /obj/item/clothing/shoes/combat
corpsepocket1 = /obj/item/weapon/storage/fancy/matchbox
corpsebelt = /obj/item/weapon/storage/belt/security
/obj/effect/landmark/corpse/creed
name = "Major Creed"
corpseuniform = /obj/item/clothing/under/darkred
corpsesuit = /obj/item/clothing/suit/armor/hos/jensen
corpseglasses = /obj/item/clothing/glasses/thermal/eyepatch
corpsemask = /obj/item/clothing/mask/cigarette/cigar/cohiba
corpsehelmet = /obj/item/clothing/head/helmet/tactical/HoS/dermal
corpsegloves = /obj/item/clothing/gloves/combat
corpseshoes = /obj/item/clothing/shoes/combat
corpsepocket1 = /obj/item/weapon/storage/fancy/matchbox
corpsebelt = /obj/item/weapon/storage/belt/security
/obj/effect/landmark/corpse/batman
name = "Batman"
corpseuniform = /obj/item/clothing/under/batmansuit
corpsesuit = /obj/item/clothing/suit/armor/bulletproof
corpseglasses = /obj/item/clothing/glasses/thermal/jensen
corpsemask = /obj/item/clothing/mask/gas/swat
corpsehelmet = /obj/item/clothing/head/batman
corpsegloves = /obj/item/clothing/gloves/batmangloves
corpseshoes = /obj/item/clothing/shoes/jackboots/batmanboots
corpsebelt = /obj/item/weapon/storage/belt/security/batmanbelt
/obj/effect/landmark/corpse/doomguy
name = "Doomguy"
corpseuniform = /obj/item/clothing/under/doomguy
corpsesuit = /obj/item/clothing/suit/armor/doomguy
corpseglasses = /obj/item/clothing/glasses/thermal/jensen
corpsehelmet = /obj/item/clothing/head/helmet/doomguy
corpsegloves = /obj/item/clothing/gloves/doomguy
corpseshoes = /obj/item/clothing/shoes/combat
corpsebelt = /obj/item/weapon/storage/belt/security/doomguy
/obj/effect/landmark/corpse/dredd
name = "Judge Dredd"
corpseuniform = /obj/item/clothing/under/darkred
corpsesuit = /obj/item/clothing/suit/armor/xcomsquaddie/dredd
corpseglasses = /obj/item/clothing/glasses/hud/security
corpsemask = /obj/item/clothing/mask/gas/swat
corpsehelmet = /obj/item/clothing/head/helmet/dredd
corpsegloves = /obj/item/clothing/gloves/combat
corpseshoes = /obj/item/clothing/shoes/combat
corpsebelt = /obj/item/weapon/storage/belt/security
/obj/effect/landmark/corpse/jensen
name = "Agent Jensen"
corpseuniform = /obj/item/clothing/under/acj
corpsesuit = /obj/item/clothing/suit/armor/hos/jensen
corpseglasses = /obj/item/clothing/glasses/hud/security/jensenshades
corpsehelmet = /obj/item/clothing/head/helmet/tactical/HoS/dermal
corpsegloves = /obj/item/clothing/gloves/combat
corpseshoes = /obj/item/clothing/shoes/combat
corpsebelt = /obj/item/weapon/storage/belt/security
//////////////////Misc Corpses/////////////////////////// //////////////////Misc Corpses///////////////////////////
/obj/effect/landmark/corpse/civilian //Random corpse! /obj/effect/landmark/corpse/civilian //Random corpse!

View File

@@ -1,3 +1,46 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscdel (general deleting of nice things)
# rscadd (general adding of nice things)
# imageadd
# imagedel
# spellcheck (typo fixes)
# experiment
# tgs (TG-ported fixes?)
#################################
author: CptWad author: CptWad
changes: []
# Any changes you've made. See valid prefix list above.
# There needs to be a space after the - and before the prefix. Don't use tabs anywhere in this file.
# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit.
# If you're using characters such as # ' : - or the like in your changelog, surround the entire change with quotes as shown in the second example. These quotes don't show up on the changelog once it's merged and prevent errors.
# SCREW ANY OF THIS UP AND IT WON'T WORK.
changes:
- bugfix: Large shitsling of bugfixes and minor additions.
- bugfix: "#11746 #10910 #10517 #10454 #7163 #7243 #11103 #10985 #11814 #11813 #11101 #10623 #10222"
- rscadd: Wizards Dens are now surrounded by purple void. Groovy.
- rscadd: In the same vein Syndicate shuttles should no longer be able to find out that they are not on a planet, even when wearing thermals! How Immersive!
- experiment: ERT have been locked in their room after many lootings of Centcomm. They now however have new gear to use, yes that includes the much requested magboots.
- experiment: Added a whole medical and science wing to Centcom, mostly for testing purposes and admin use.
- tweak: The Court at centcomm is now pimped out and functional.
- rscadd:: Added new Centcom employees that admins can quickly take over and use. Quicker busses coming your way!
- tweak: Post round chill zone at centcom has been increased and made prettier. Includes all instruments and a non-IDlocked boozeomat!
- spellcheck: "Pictures of changes here https://github.com/d3athrow/vgstation13/pull/11974"
delete-after: false delete-after: false

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff