Commit Graph

454 Commits

Author SHA1 Message Date
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
0d0322b93c Adjusts shotgun ammo box contents 2016-10-03 21:48:16 -05:00
Spades
473dd5b35e Fixes booze bible
It didn't spawn with usable money. That's fixed now.
2016-09-30 06:28:45 -04:00
Anewbe
e65b0851f3 Adds emp shotgun shells, not yet obtainable. 2016-09-25 23:52:30 -05:00
Anewbe
cab561ef78 Merge pull request #2538 from Neerti/9/24/2016_port_of_port_of_circuits
Ports the Port of Integrated Circuits
2016-09-24 20:40:44 -05:00
Neerti
801a162ba7 Ports the Port of Circuits
Ports PsiOmegaDelta's port of integrated circuits, which has several improvements in code quality.
Ports a few small things like the weakref datum and some macros.
2016-09-24 18:06:11 -04:00
redstryker
6ab9bee9ee Fixed Var 2016-09-24 00:34:11 -04:00
redstryker
83b080f65c Handbags 2016-09-24 00:20:48 -04:00
Anewbe
2b81c0ed63 Merge pull request #2525 from Neerti/9/21/2016_w_class_defines
Centralizes weight class / inventory definitions
2016-09-22 16:46:05 -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
comma
7af5606bab Adding a article 2016-09-21 17:30:32 +01:00
comma
297a5a936c Makes cigs branded too
Description of cig/cigbutt would reveal its brand for dastardly murdersolving revelations.
2016-09-21 17:26:51 +01:00
Anewbe
2fe7af22f8 Secbelt can hold stun revolvers and eguns 2016-09-17 14:28:41 -05:00
redstryker
05b65b48f3 Black Messenger Bag 2016-09-16 21:21:59 -04:00
Neerti
8cdb444b73 Merge pull request #2455 from SpadesNeil/Naming-Consistency
Station Naming Inconsistency Fixes
2016-09-15 16:42:12 -04:00
redstryker
0fbbc0198b Messenger Bags 2016-09-14 22:34:47 -04:00
redstryker
75e2011c28 Allows Wirer To Attach to Toolbelts 2016-09-14 17:03:34 -04: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
redstryker
ac81a5003c Examine Cigarette Lore 2016-08-28 16:04:07 -04:00
SinTwo
a2a2f58e93 Fixes #2352 2016-08-27 13:44:32 -04:00
Anewbe
0cb1f8c27a Cleans up the code to match recent Tajaran rewrite 2016-08-13 23:07:00 -05:00
Kelenius
d0a0a64722 Merge branch 'master' into fuckCael 2016-08-08 18:41:18 +03:00
Kelenius
93d07036ef Rewrites xenoarch
See changelog
2016-08-07 08:26:26 +03:00
Yoshax
60c4fb436c no message 2016-08-07 01:39:55 +01:00
Yoshax
403c9adcdb Low/er end combat force adjustments 2016-08-07 01:31:45 +01:00
SinTwo
279cbdfafe more icon fixes 2016-08-03 14:10:29 -04:00
Yoshax
829ac652b4 Re-add package bombs 2016-07-26 20:18:39 +01:00
Neerti
fc762a6e83 Merge pull request #2189 from SinTwo/item_state
Icon Fix Fun Time
2016-07-24 19:21:09 -04:00
SinTwo
1a6504a47c more item_state fixes: worn_state purge 2016-07-24 19:03:15 -04:00
Anewbe
89e98a39fb Merge pull request #2181 from Yoshax/uplinkcosttweaks
Uplink cost tweaks
2016-07-24 17:13:03 -05:00
SinTwo
8e9676aa26 storage item item_state fix 2016-07-24 00:19:45 -04:00
Yoshax
305255d2ee Adjusts uplink item costs 2016-07-23 21:00:53 +01:00
SinTwo
c1bd0aa6b4 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into item_state
Conflicts:
	code/modules/clothing/clothing.dm
2016-07-19 17:37:14 -04:00
SinTwo
b4f85ff533 cleanup and fixes 2016-07-19 17:25:45 -04:00
Mark9013100
67279bf012 Allows belts to hold all tape rolls 2016-07-18 22:24:18 -04:00
SinTwo
976847a0b4 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into item_state
Conflicts:
	code/modules/clothing/head/jobs.dm
	icons/mob/items/lefthand.dmi
	icons/mob/items/righthand.dmi
	icons/mob/suit.dmi
	icons/mob/uniform.dmi
	icons/obj/items.dmi
2016-07-13 17:07:52 -04:00
SinTwo
91b6ca3d7b item states are awful 2016-07-12 23:02:29 -04:00
SinTwo
7192bf08fd item_state cleanup 2016-07-11 22:31:32 -04: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
Anewbe
f375595d30 #MoreDice2016 (#2016)
* Adds more dice

* Adds sprites, fixes some pathing
2016-07-03 19:48:28 +01:00
Datraen
299059a5be Merge pull request #1883 from Yoshax/drinks
Ports GinjaNinja32's drinks rewrite from Bay
2016-06-10 23:08:41 -04:00
Arokha Sieyes
08972b1dc5 Better, now. 2016-06-09 18:28:16 -04:00
Arokha Sieyes
74a1b59a39 Adds IDs and Wallets
Adds variants of ID cards for each department and head, and adds several new colors of wallet. The wallets self-color the little ID in the corner based on the ID inserted so they always show the right picture of the ID, without needing to sprite each ID. Some are snowflaked, notably Gold and Centcom, but the rest are generated on the fly based on colors on the ID.
2016-06-08 19:29:47 -04:00
GinjaNinja32
debfd3dabf Ports GinjaNinja32's drinks rewrite from Bay 2016-06-06 20:33:11 +01:00
Datraen
fbb0f764d2 Adds a missing (src) 2016-06-02 18:12:21 -04:00
Yoshax
0777379d37 Fixes box of EMP grenades only ever spawning 1 grenade 2016-06-01 02:00:57 +01:00
Yoshax
0a6d1aa08d Makes detective belts hold detective guns 2016-05-21 15:21:07 +01:00