Commit Graph

433 Commits

Author SHA1 Message Date
Eearslya
85c3e22873 Polaris sync 2016-08-06 20:34:44 -07: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
viv-eret
661655f362 Removed a ". 2016-07-24 17:29:41 -07:00
viv-eret
af80b028e0 Added a ". 2016-07-24 17:28:30 -07:00
viv-eret
56a4a3dea9 fixes formatting issue 2016-07-24 17:09:38 -07:00
viv-eret
9147719a3a changes to allow only horses to wear it 2016-07-24 17:03:25 -07:00
viv-eret
96fff1dda2 fixed some formatting errors 2016-07-24 16:30:28 -07:00
viv_eret
2cdec12e11 Adds horsehalf saddlebag in loadout.
Shouuuld let you get a bag sprited for horsetaurs in loadout
accessories.
2016-07-24 16:24:08 -07: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
Yoshax
b6efd91e92 Fixes #1163 2016-05-19 22:30:31 +01:00
Arokha Sieyes
79684a3488 Fixes #1636
Donut boxes only held 6 because they had 6 stuffed into them by New(). The empty ones didn't have that. This manually sets the size to hold 6 donuts.
2016-05-19 11:36:18 -04:00
Yoshax
f059a542b0 Belts no longer drop when dragged to /obj/screen 2016-05-16 16:36:27 +01:00
Yoshax
718b249b1d Uplink changes and additions (#1645)
* Splits uplink categories into separate files and moves other files around

* Corrects an incorrect description

* Puts uplink categories in uplink_categories into the same order as they are individual files

* Mercenaries now spawn with their own private uplink.

* Adds a random discount to uplink items that is applied every 15 minutes

no message

no message

* Adds changelog

* Fakes announcements are now once again purchasable from the uplink and actually work

* Removes a debug line

* Adds several existing items to the antag uplink including stun rounds for shotguns, metal foam grenades and more

* Refactors boxes.dm to use absolute pathing and for loops for contents

Adds changelog
2016-05-15 18:31:34 -04:00
redstryker
ff361c2023 Changes all references to 'Mars University' to 'Mojave University' 2016-05-06 18:23:40 -04:00
Yoshax
47508187cc Makes smoke grenades last longer and adjusts checks
- Changes boxes of smokes from 5 to 7 grenades
- Changes mapped in single smoke grenades to boxes
2016-05-06 17:25:28 +01: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
Anewbe
7b1eb6c099 Refactors specialized satchels as children of the regular (leather) satchel 2016-04-29 18:44:28 -05:00
Neerti
554adc1743 Merge pull request #1467 from Nerezza/ParaDuffels
Adds EMT Duffelbags
2016-04-21 21:08:19 -04:00
Neerti
114a3e38bc Merge pull request #1463 from Yoshax/storagefixes
Normalises medical item storage size + fixes
2016-04-21 21:07:34 -04:00
Nerezza
24cd704115 Adds EMT Duffelbags
Sprites EMT variation of medical duffels and places them into the bottom of their locker.
2016-04-21 16:37:43 -05:00
Yoshax
0a249df22e Normalises medical item storage size + fixes
Makes all first aid kits the same size,
Fixes pill bottles not holding 14 pills,
Fixes antag surigcal kit not holding all the items.

Adds a max weight class of 1 to pill bottles

Properly adjusts antag surgical kit size
2016-04-21 16:15:45 +01:00
Kelenius
98badae45f Merge branch 'master' into cleanupTwo 2016-04-21 11:41:32 +03:00
Neerti
69a4242b17 Inventory Tweaks 1
Evidence bags should no longer start empty.
Reduces maximum width for the inventory background slightly.
Makes a new, slimmer to close the inventory.  This and the maximum width reduction mean the inventory should never overlap with other UI buttons.
2016-04-16 10:28:14 -04:00
EmperorJon
482316ed55 Merge pull request #1368 from Neerti/4/6/2016_new_inventory_port
Ports Bay's new inventory system.
2016-04-16 02:58:07 +01:00
Anewbe
ac79c48293 Lunchboxes should now fit in backpacks
* Lunchboxes should now fit in backpacks

* Makes lunchbox max_w_class 2
2016-04-06 20:19:55 -04:00
Neerti
25c04df5bd Polaris tweaks.
Fixes mistake involving belts.
Fixes mistake involving bags allowing w_class 5 items, which was from the manual merge.
Polaris tweaks

Makes inflatables w_class 3.
Spacesuits and RIGs are now w_class 5.
Both sniper weapons are now w_class 5.
Makes more inventories able to use the volume based system.
Cleans up the cig part of the port a bit.
2016-04-06 07:48:09 -04:00
Neerti
469c01daf9 Manually ports Bay's volume inventory system. 2016-04-06 03:31:21 -04:00
PsiOmegaDelta
48b773fcfa Can now select the design and contents of your loadout lunchbox.
Also allows gear tweaks to take up a whole row on their own, due to potential length.
Also fixes a couple of incorrect && logical operations. Should have been ||.
2016-04-05 11:57:30 -04:00
Yoshax
fc845d12af Adds a missing comma 2016-04-03 17:31:51 +01:00
Yoshax
35d8092d98 Further cleans up pathing in file 2016-04-03 17:26:23 +01:00