Commit Graph

5970 Commits

Author SHA1 Message Date
Yoshax
829ac652b4 Re-add package bombs 2016-07-26 20:18:39 +01:00
Anewbe
66f373d313 Merge pull request #2208 from SinTwo/itme_state_cleanup
Icon Name Fixes
2016-07-25 22:11:20 -05:00
SinTwo
8eae6a7dee (hopefully) last name tweak 2016-07-25 19:50:19 -04:00
Yoshax
7fbb123a4d Improves/fixes surplus crate item selection 2016-07-25 23:13:12 +01:00
Yoshax
f19c922984 Improves surplus crates 2016-07-25 21:45:54 +01:00
EmperorJon
9467b103bb Merge pull request #2197 from Yoshax/uplinkreduxboogalodiscount
Reduces antag uplink discount refresh time to 10 minutes
2016-07-25 17:54:58 +01:00
Yoshax
9f2ffa9c03 Corrects an uplink item path 2016-07-25 14:39:43 +01:00
Yoshax
b041a9943b Reduces antag uplink discount refresh time to 10 minutes 2016-07-25 14:04:02 +01: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
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
Anewbe
56f9e63c64 Adds pockets to the HoS and Warden coats 2016-07-24 15:55:54 -05:00
EmperorJon
6838880374 Merge pull request #2020 from Yoshax/flashnerf
Makes flashes confuse and blind the person instead of stunning
2016-07-24 09:19:40 +01:00
Anewbe
79fda58e47 Merge pull request #2185 from SinTwo/item_state
Item State Cleanup Fix
2016-07-23 23:32:27 -05:00
SinTwo
8e9676aa26 storage item item_state fix 2016-07-24 00:19:45 -04:00
SinTwo
66c3a007a9 frame cleanup fixes 2016-07-23 23:45:24 -04:00
Anewbe
612a6f8328 Merge pull request #2149 from SinTwo/item_state
Item State Cleanup
2016-07-23 15:53:36 -05:00
Neerti
313aff19b7 Merge pull request #2179 from Yoshax/gottagofast
Ports /vg/ get_turf
2016-07-23 16:34:31 -04:00
Neerti
d3126ad10b Merge pull request #2180 from Yoshax/presentsoffood
Cargo fixes + Shipping stuff
2016-07-23 16:34:24 -04:00
Neerti
875e5c2779 Merge pull request #2176 from Yoshax/typofix
Grammar fix + Ensures Christmas drop pod has trees
2016-07-23 16:33:17 -04:00
Yoshax
305255d2ee Adjusts uplink item costs 2016-07-23 21:00:53 +01:00
Yoshax
93b7e661c4 Ensures contraband for supply computers can be properly acquired via hacking 2016-07-23 20:24:04 +01:00
SinTwo
eb120319eb Frame code cleanup 2016-07-23 13:31:30 -04:00
comma
2fc033ee0e Ports /vg/ get_turf
Gotta go faster.
Possibly undocumented behaviour of get_step?
2016-07-23 18:00:50 +01:00
PsiOmegaDelta
76dc56bd2b Robot upgrades now checks that the upgrade type is valid.
As opposed to the instance itself. Fixes #13652.
2016-07-23 16:13:29 +01:00
Yoshax
079ce6a71f Grammar fix + Ensures Christmas drop pod has trees 2016-07-23 15:23:54 +01:00
SinTwo
4bff201f8b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into item_state
Conflicts:
	code/game/objects/items/devices/telecrystal.dm
	icons/mob/suit.dmi
	icons/obj/clothing/suits.dmi
2016-07-22 23:39:19 -04:00
Yoshax
fad919c039 Adds telecrystal teleporting 2016-07-23 00:27:17 +01:00
Yoshax
3f0a95ae3a Ensures there's no funny business with powering up emags 2016-07-22 23:05:54 +01:00
EmperorJon
a94cad7a59 Merge pull request #2168 from Yoshax/telecrystals
Multiplies all Telecrystal stuff by ten to setup for fine cost adjusting
2016-07-22 19:34:08 +01:00
Neerti
ae497b0dd8 Communicator Texting for Ghosts
Ghosts can now text communicators in round, and can be texted by those back.
This is obviously logged, just in-case funny business occurs.
Adds verbs to display a log of messages that a ghost has sent and received, as well as a verb to send a message to a communicator of their choice.
2016-07-22 12:51:00 -04:00
Yoshax
21f856ed47 Multiplies all Telecrystal stuff by ten to setup for fine cost adjusting 2016-07-22 17:35:20 +01:00
EmperorJon
683bba42ee Merge pull request #2135 from Anewbe/dual-wield_unathi
Unathi knives can now be wielded in unison
2016-07-20 12:11:21 +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
cf45a827a9 final cleanup 2016-07-18 16:03:53 -04:00
Anewbe
9cfc9222d6 Corrects the way stunbatons check for charge on attack 2016-07-16 23:05:06 -05:00
Anewbe
a79c8d8768 Unathi knives can now be wielded in unison 2016-07-14 18:14:58 -05:00
Neerti
9ac2ad0b86 Merge pull request #2113 from Yoshax/randomitems
Random item clean up, adjustment and addition
2016-07-13 19:11:50 -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
Anewbe
b08ddfefff Fixes lighters being able to ignite people while off. 2016-07-12 22:13:04 -05:00
SinTwo
91b6ca3d7b item states are awful 2016-07-12 23:02:29 -04:00
Yoshax
ecb2c9d5d7 Adds changelog 2016-07-12 20:33:55 +01:00
Yoshax
527b71335e Random item clean up, adjustment and addition 2016-07-12 19:55:10 +01:00
SinTwo
7192bf08fd item_state cleanup 2016-07-11 22:31:32 -04:00
EmperorJon
32129232b7 Merge pull request #2086 from Neerti/7/10/2016_freezer_fixes
Freezer Fixes
2016-07-10 10:56:59 +01: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
Yoshax
66a27846e7 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into cargo 2016-07-10 03:49:46 +01:00