Commit Graph

596 Commits

Author SHA1 Message Date
Anewbe
7bb3f5fbb7 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into cosmetic_things
# Conflicts:
#	code/datums/supplypacks/medical.dm
#	code/game/objects/structures/crates_lockers/closets/wardrobe.dm
#	code/modules/clothing/shoes/miscellaneous.dm
#	code/modules/clothing/suits/labcoat.dm
#	icons/mob/back.dmi
#	icons/mob/feet.dmi
#	icons/mob/human_face.dmi
#	icons/mob/items/lefthand.dmi
#	icons/mob/items/righthand.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/shoes.dmi
#	icons/obj/clothing/suits.dmi
#	icons/obj/storage.dmi
#	maps/northern_star/polaris-2.dmm
#	maps/northern_star/polaris-5.dmm
2017-04-01 12:45:45 -05:00
Yoshax
ba7cad162d Revert "Makes space in the uniforms.dmi file"
This reverts commit 6b0500dd27.
2017-03-27 03:34:12 +01:00
Anewbe
6b0500dd27 Makes space in the uniforms.dmi file 2017-03-26 00:59:14 -05:00
Arokha Sieyes
9660186dfd Not So Simple Animals (#3103)
* Merge two not-really conflicts

Thanks git, that whitespace conflict was super important?

* DME merge

* Added defines for mobs used by simple animals.

* Lost a slime along the way

* Disable debug settings

* HONK!!!

* Remove redundant hostile decls

* Replace loc= with forceMove in old SA code

I guess I should think of the children.
2017-03-22 14:30:07 -05:00
nachomeep
e1554f323b Adds engineering + science crates (#3072)
* Adds engineering + scicrates.

* Enables the science crate

* Updates engineering crate icons.

* Inflatables don't need security.

* fixes RCD crates
2017-03-21 18:38:47 -05:00
Arokha Sieyes
400b0749aa Add one inflatables kit to paramedic lockers
Makes sense to meeee. Hopefully it does to you, too. Gotta rescue those people!
2017-03-15 23:56:52 -04:00
Anewbe
2de037fbbf Ports a bunch of fluff stuff 2017-02-21 13:50:14 -06:00
Anewbe
7417bef794 Boots are now a subtype of shoes 2017-02-05 16:17:41 -06:00
Anewbe
db41b99d17 Adds locker contents for HoS/Warden and a medical sunglasses for CMO 2017-01-27 00:26:52 -06:00
Anewbe
fda82d4b17 Hood tweaks 2017-01-18 17:02:01 -06:00
Anewbe
2c86a0a465 Returns the Vox, who now breath Phoron 2017-01-06 17:49:39 -06:00
Anewbe
e8e0ab8762 Fixes two items not spawning properly, moves CE welder to locker 2016-11-23 16:13:55 -06:00
Yoshax
2c6d023fc7 Changes an attack_ai to attack_robot 2016-11-20 18:04:09 +00:00
Yoshax
98c1bcb614 Allows borgs to use toggle lock on closets/crates 2016-11-20 01:39:50 +00:00
Anewbe
da90b87802 Ports Bay's tape recorders 2016-11-11 00:10:55 -06:00
PsiOmegaDelta
65b12a10f2 Adds subtype friendly method to populate crates. 2016-10-25 21:40:28 +01:00
Anewbe
510cf17723 Waistcoats are accessories 2016-10-19 22:29:22 -05:00
Anewbe
771d8b9e4b Adds a smaller device cell for use in non-weapon devices 2016-10-08 15:34:18 -05:00
Anewbe
673e75832a Merge pull request #2602 from SpadesNeil/death-to-the-administrator
Replaces Station Administrator with Colony Director, NASA Approved
2016-10-06 22:31:14 -05:00
Spades
2330968176 Replaces Station Administrator 2016-10-06 22:38:02 -04:00
Anewbe
0f51fda83a Energy weapons can be reloaded 2016-10-06 21:30:52 -05:00
Anewbe
623ad86511 Fixes cargo exploit 2016-09-25 19:59:47 -05:00
Neerti
828dacf485 Centralizes weight class definitions
A lot of new defines are now in inventory_sizes.dm, which contains;
All the size identifiers (the thing that tells the game if something is bulky, or w/e).
Storage costs for all the sizes, which are exponents of two, as previously.
A few constants for inventory size.

Also changes all storage item's capacity definitions by basing it off of how many 'normal slots' exist for it.  This allows one to change the definition for all of the defines in the file, and everything will follow along without needing to change 500 files.  In testing, I made all ITEMSIZE_COST_* defines doubled, and nothing had broke.

The benefit of doing all of this is that it makes adding new weight classes in the future much simpler, and makes knowing how much space a container has easier, as seeing ITEMSIZE_COST_NORMAL * 7 means it can hold seven normal items.
2016-09-22 00:51:51 -04:00
Anewbe
41113637f1 Slightly cleans up the occupation screen, adds uniform to locker 2016-09-17 23:49:36 -05:00
redstryker
05b65b48f3 Black Messenger Bag 2016-09-16 21:21:59 -04:00
comma
bef27aa9ba Adds randomized alohas
Also some color matrix helpers from TG
2016-09-16 00:14:00 +01:00
comma
3ff6caa722 Adds hawaii shirt
Attachable to any uniform, works like suit jackets.
2016-09-16 00:00:48 +01:00
Neerti
8cdb444b73 Merge pull request #2455 from SpadesNeil/Naming-Consistency
Station Naming Inconsistency Fixes
2016-09-15 16:42:12 -04:00
PsiOmegaDelta
2007c143d2 Refactors the forceMove() drop.
Makes dropping a its proc instead, cleaning up forceMove() handling.
2016-09-15 17:11:57 +01:00
Spades
9c78d6a2a1 Naming inconsistencies fixed
The short naming of central command has been really inconsistent across
the game's files. This has always annoyed the shit out of me.

CentComm and Centcomm and Centcom are now all CentCom, specifically with
that capitalization. Why one M instead of two M's? Because Comm with two
'M's = Communications. Hence, Telecomms, NOT Telecoms. Telecoms is
incorrect. CentCom was also chosen because CentCom with one M and this
casing is most found throughout the game's files.

Speaking of Telecomms, I corrected one instance in the game where it's
Telecom. Like I said, this is not correct. There was only one
inconsistency.

Likewise, Nanotrasen has been changed to NanoTrasen. Nanotrasen only
appears 20 times, where NanoTrasen appears 62. NanoTrasen is clearly the
preferred, correct naming.
2016-09-13 16:36:43 -04:00
Anewbe
b7353696db Tweaks skirt pathing 2016-09-06 22:31:42 -05:00
SinTwo
a2a2f58e93 Fixes #2352 2016-08-27 13:44:32 -04:00
Anewbe
4aaa45736d Tweaks the contents of the captain's closet 2016-08-21 21:22:09 -05:00
Anewbe
6b0704f10f Adds pepperspray and a crowbar to the HoS locker 2016-07-31 23:05:38 -05:00
Yoshax
6945aff868 Merge pull request #2187 from Anewbe/sec_coat_pockets
Adds pockets to the HoS and Warden coats
2016-07-25 01:41:45 +01:00
SinTwo
1a6504a47c more item_state fixes: worn_state purge 2016-07-24 19:03:15 -04:00
Anewbe
56f9e63c64 Adds pockets to the HoS and Warden coats 2016-07-24 15:55:54 -05:00
Neerti
e9dd848cf1 Freezer Fixes
Freezer crates, freezer boxes, cryobags, and medical grippers now properly preserve organs, as well as organs attached to organs.
Cleans up storage.dm slightly by removing loc setting with forceMove(), for the above to work.
2016-07-10 03:00:25 -04:00
PsiOmegaDelta
457b4cc367 Large crates now insert items on initialization.
Similar to how crates/lockers do it.
2016-06-07 19:06:45 +01:00
Yoshax
f75d509e7f Ports event system from Bay 2016-06-01 22:05:04 +01:00
SinTwo
3ed17ad1ec Back to /rank/ 2016-05-18 15:08:18 -04:00
SinTwo
64df53f568 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into clothes
Conflicts:
	icons/mob/uniform.dmi
2016-05-06 21:03:18 -04:00
SinTwo
8f5dd213ed Merge branch 'master' of https://github.com/PolarisSS13/Polaris into clothes
Conflicts:
	icons/mob/uniform.dmi
	icons/obj/clothing/uniforms.dmi
2016-05-06 18:31:07 -04:00
SinTwo
5e4ca22080 Adds skirts by JakkSergal, cleans up skirts, simplify skirts on loadout. 2016-05-06 18:17:19 -04:00
Yoshax
4d160c261d Revamps cargo supply code to allow for nicer code (#1508)
* Adds lunchboxes to dinnerware vendor and buffs the amount of ingredients the chef starts with

* Revamps cargo supply code to allow for multiple items to be ordered on one line and nukes the remaining multiple lined orders

Corrects a number mistake

Fixes some list formatting

Actually fixes list formatting

* Removes a stray comma
2016-05-04 17:20:22 -04:00
Datraen
beda3185eb Reverts the second mob clean up because of incomplete implementation.
This caused an error that would then cause machinery to hang on the server, and was reproduced successfully.
2016-05-04 00:24:55 -04:00
SinTwo
5ae20ceb8b Buildables v1.2 (#1517)
* Removes text2path, adds constructability to a few things, adds a locker_painter.dm, and several fixes.

* Fixes Maps due to working on ancient versions.

* Path error.

* Adds a missing ..()
2016-05-03 22:18:12 +01:00
Anewbe
22a9b32a29 Fixed the map thing and a few other issues. 2016-04-29 19:08:04 -05:00
Anewbe
7b1eb6c099 Refactors specialized satchels as children of the regular (leather) satchel 2016-04-29 18:44:28 -05:00
Yoshax
5d6e129ebf Adjusts HoS' locker capacity 2016-04-28 21:37:57 +01:00