Commit Graph
67 Commits
Author SHA1 Message Date
ElorgRHGandGitHub e843567671 Clothing (jumpsuit) DMI split, unused jumpsuit sprite purge along the way (#19092)
* Medical and RnD DMI files split

* Cargo DMI split

* Security DMI split

* Engineering DMI split

* Captain DMI split

* Civilian/service DMI split

This one hurt

* Forgot about this one

* Color DMI split

* Purges everything that was delted up until this point

... with a blindfold and a shotgun

* Dress and suit DMI split

* Pants and shorts DMI split

and merges pants and shorts files... shorts are pants, right?

* Donator/fluff jumpsuit clothing organisational relocation

* e

oops

* So this is used, repath bad

* Random commit

* Costumes DMI split and jumpsuits purge

* Some fixes

* pennywise

* Centcom DMI split

* SolGov DMI split

* Retro DMI split

* Syndicate DMI split

* Misc DMI split

* centcom officer

* Kills off uniform.dmi completely

* last fixes

* lastest fixes

* vox navy gold conflict

* civilian barber

* Tourist observers work now

* Hopefully working non-human humanoid clothing

* This being in suit.dmi is one of the reasons I made this PR

* This shouldn't be here

* Late night coding

* Pun Pun regains his drip

* Last fixes

* security/OFFICER

* Most important - clown fix

* working subtypes good

* Fixes chameleon jumpsuit

* Proper QM pathes

* Fixes jumpsuit rolling with the power of poor quality code

* Cargo tech character setup fix

* else instead

why didn't I do this in the first place

* PURP

* Fixes broken character setup job clothing

* CC suit fix

* Psychedelic jumpsuit proper path

* You must wear the jumpsuit to adjust it
2022-10-09 14:24:10 +01:00
ElorgRHGandGitHub 628748a1ee Adds garment bags to reduce locker clutter: Paradise edition (#18869)
* Garment bags

* Small prevention of gaming

* Larger prevention of gaming

* This looks better I think

* Holding a LOT of clothing in your backpack seems like a bad idea
2022-08-25 16:40:39 +01:00
ChristasmurfandGitHub 51c1ef55ee Engineering Drip Lite™ (#18231)
* Merge remote-tracking branch 'upstream/master' into engiclothingpack

* In hand sprites

* satchel fitting
2022-07-16 20:39:26 -05:00
S34NW 1723e0b503 Merge branch 'master' into 3/4th-closet 2021-11-01 10:14:41 +00:00
Vi3triceandGitHub 758908e5ff CE closet has an RCD (#16820) 2021-10-26 23:32:38 +01:00
S34NW 5dc80d6cba steel pass 2 2021-10-02 22:26:37 +01:00
S34NW 83f8fbdfac locker door and open state trimming 2021-09-28 00:51:19 +01:00
S34NW 1c867b414c HERE COME THE CLOSETS 2021-09-27 19:33:42 +01:00
Fox McCloudandGitHub 75935ff876 Converts Eye Augments to Cybernetic Eyes (#15519)
* Converts Eye Augments to Cybernetic Eyes

* literally not used

* it helps when you properly include all the code

* flashlight eyes

* tweaks

* conflict resolution

* can't have two eyes

* order of operations matters here

* autosurgeon
2021-03-03 20:21:30 +00:00
Fox McCloudandGitHub 003a1f7cba Tank Refactor; Breathing Retool (#15371)
* Tank Refactor Breathing Retool

* missed maps and doc

* just in case
2021-01-28 20:57:37 +00:00
Fox McCloudandGitHub de795c4e31 Radiation Refactor (#15331)
* First Commit

* visible radiation and engine goggles

* correction

* t-ray fix

* further adjustments and fixups

* gieger addition and cleaning fixup

* yet more fixes

* styling fixes

* fixes

* human glowing fix

* do the merge conflict avoidance dance

* Update supermatter.dm

* supermatter rads

* mapping in

* radiation doors

* yeah yeah line endings

* clean up

* styling issues

* showers
2021-01-24 22:03:13 +00:00
AffectedArc07andGitHub f3d903acf3 Makes closets Initialize() (#15137) 2020-12-20 08:25:29 -05:00
Aquilar 898ca53e71 deconflict
Signed-off-by: Aquilar <20759278+Aquilar@users.noreply.github.com>
2020-03-18 15:09:43 +08:00
Aquilar 25102492c0 Merge branch 'master' into blueprintpinpointerfix
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2020-03-18 15:06:19 +08:00
AffectedArc07andGitHub 04ba5c1cc9 File standardisation (#13131)
* Adds the check components

* Adds in trailing newlines

* Converts all CRLF to LF

* Post merge EOF

* Post merge line endings

* Final commit
2020-03-17 18:08:51 -04:00
Aquilar fa84366203 Added an icon to differentiate the blueprints from the CE's blueprints. purely to prevent confusion.
Fixed the pinpointer from pointing to cyborg and slime blueprints by;
Changing the steal objectives to require the CE's copy of the blueprints exclusive. Which required changing few lines in various places that reference that specific copy.

Signed-off-by: Aquilar <20759278+Aquilar@users.noreply.github.com>

missed the line in photography.dm
2020-02-01 19:06:03 +08:00
AffectedArc07 c64bc93649 Replaces all var/const with #define 2020-01-28 21:25:20 +00:00
MrMagolorandvariableundefined 80bb221891 Adds an ATMOS Holofan Creator to the Chief Engineer's locker (#12419) 2019-09-26 16:59:20 -07:00
variableundefinedandGitHub b75db54b1f Merge pull request #12015 from SteelSlayer/atmos-QoL
Atmos tech QoL & Disposal pipe tweaks
2019-08-28 11:14:17 -04:00
Fox McCloud 899eb9c948 Ports Jetpack Upgrades. Removes Jetpack Suit Storage 2019-08-26 00:11:42 -04:00
SteelSlayer e0a34a179b Adds destination tagger to atmos locker 2019-08-17 13:07:35 -04:00
Kyep fd389810f2 medals in lockers 2019-07-10 20:13:14 -07:00
Ionward ba7491fa49 cleaned up and made all mantles a child of the base mantle 2019-04-09 02:54:06 -07:00
Ionward a792d46085 adds mantles! 3 public access ones (in default clothes vendor,) and 6 command ones, each in their respective heads' lockers. 2019-04-09 01:06:19 -07:00
datlo d140b858ec Adds the oxygen grenade 2019-01-23 21:36:08 +00:00
lass9030 b96ce8db76 hudimplant to heads locker 2019-01-01 16:53:52 +01:00
Fox McCloud b394cf3624 Ports Holoprojectors 2018-04-30 00:24:46 -04:00
Fox McCloud 8c7b543415 The Great Conflictening 2.0: Removes /obj/item/device 2018-04-25 23:07:35 -04:00
Fox McCloud 5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
FalseIncarnate 96c615132a Adds departmental and head of staff mugs
Adds mugs for each department to the loadout.
- The service mug is available to all jobs

Adds mugs for heads of staff, found in their respective locker.
- CE, RD, CMO, HoS, HoP, Captain

Moved mugs to their own loadout category
2018-01-25 01:52:04 -05:00
Jovaniph f6fff8f33f Refactor the lockers to make maintainers happy? 2017-09-16 10:47:00 -04:00
taukausanake ee9e662179 Atmospherics duffel bag and duffel edits
Creates a new duffel bag for Atmospherics. It is a resprite of the Engineering bag with light blue lines on it and a dark blue strap.
Also adds colored strips to each of the Medical duffels (Chem, Gene, Viro) as well as to Toxins as they seemed a little lacking in their special color. Can undo if desired as they are different from before but the same between all sprite types.

In-hand and on-mob sprites have been updated accordingly. Atmos duffel bag spawns in Atmospherics "technician's locker". There was also a missing toxins duffel bag icon for both in-hand DMIs while each other bag had one so I made those too.
2017-07-06 02:13:54 -05:00
Citinited 01177217f2 Removes the RPD from the autolathe and adds an additional one in the CE's closet so everyone relevant in engineering can have one 2017-04-09 20:19:34 +01:00
Citinited 36afce2756 Adds the RPD
Now with 100% more Travis support
2017-03-26 06:37:00 +01:00
GeneralChaos81 7c7d63b05f Unique sprites for Engineers and Atmos tech lockers and wardrobes. 2016-08-01 16:25:50 +10:00
Mieszko Jędrzejczak 30299a0b6b hon hon, mon ami! 2016-07-09 21:56:17 +02:00
Tigercat2000 599527a480 Add skirts to wardrobe lockers. 2016-06-13 21:13:10 -07:00
Fox-McCloud c587019b87 Ports Door Wands 2016-04-25 06:06:20 -04:00
Tastyfish 178912db73 Makes the startup time significantly faster 2016-04-16 00:58:20 -04:00
Certh 591daf04d2 Corrected the capitalization of a large amount of machines and items. This will also cause BYOND to use the correct articles (a/an).
Also corrected some periods, spelling errors etc. along the way.

If this PR seems familiar, a part of this is of an earlier PR that I messed up.
2015-12-07 16:14:26 +01:00
Crazylemon 3c3f51401b Cuts out all the old weapon/module code
Also lets drones collect intercom electronics, and gives the autolathe
an APC electronics recipe
2015-10-13 21:13:49 -07:00
FreeStylaLT c290b1471e Engineering berets changes
Adds in a REAL Engineering beret, renames the current one to "atmospherics
beret", they spawn in engineering and CE's lockers.
2015-05-03 01:41:42 +03:00
CheridanandTigercat2000 acba4c6cf6 Adds construction permits
Conflicts:
	code/game/gamemodes/objective_items.dm
	code/game/objects/items/blueprints.dm
	code/game/objects/items/weapons/storage/boxes.dm
	code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
	code/modules/flufftext/Hallucination.dm
	code/modules/paperwork/photography.dm
	icons/obj/items.dmi
2015-03-26 18:52:29 +01:00
Fox-McCloud 89f2aea30d Insulated Gloves Fix 2015-03-08 19:12:35 -04:00
Markolie e1f0d0fec7 Bug fixes, add atmos watertank 2015-02-25 19:47:04 +01:00
Fox-McCloud 1a395dce03 Odds and Ends Changes 2015-01-23 21:57:00 -05:00
Fox-McCloud ff2b7cedb2 Clothing Restructuring 2015-01-02 12:40:42 -05:00
Markolie 19fde1c4a0 Bug fixes 2014-12-17 21:56:37 +01:00
Fox-McCloud b9dc61b225 forgot this 2014-12-15 05:18:24 -05:00
Markolie cd7f08cf31 More changes 2014-12-14 02:54:08 +01:00