Commit Graph

23479 Commits

Author SHA1 Message Date
Neerti
c71863dd5d Adds Slowdown for Pulling Heavy Items
Makes dragging items which would have slowed you down if worn or carried slow you down when dragged, fixing an exploit where one could move faster by dragging something instead of carrying or wearing it.
2016-07-25 03:51:45 -04:00
Anewbe
31ec93f447 Merge pull request #2192 from SinTwo/item_state
Fixes CE jumpsuit naming catastrophe
2016-07-24 20:45:43 -05:00
SinTwo
f609487da1 fixes CE jumpsuit naming catastrophe 2016-07-24 21:29:33 -04:00
Yoshax
b90254dca8 Revert "Does the standard greytide welcoming" 2016-07-25 01:49:29 +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
b4bb348e01 clothing mob sprites fix 2016-07-23 23:49:57 -04:00
Yoshax
372114be14 Merge pull request #2175 from Screemonster/AI_displays
Additional AI status displays
2016-07-23 22:59:32 +01:00
Yoshax
2f75d4757a Adds a missing path 2016-07-23 22:48:41 +01:00
Anewbe
612a6f8328 Merge pull request #2149 from SinTwo/item_state
Item State Cleanup
2016-07-23 15:53:36 -05:00
Yoshax
ba106d48f9 Adjusts some gun costs 2016-07-23 21:38:30 +01: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
4eb5ea7721 Merge pull request #2177 from Yoshax/stamps
New stamps for warden and cargo.
2016-07-23 16:33:41 -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
1fc10eaddb Adjusts surplus crates 2016-07-23 21:15:44 +01: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
Yoshax
baa25044c3 Ensures drinking glasses have a cost in the autolathe 2016-07-23 20:15:22 +01:00
Yoshax
fcf34eb54b Puts a couple of crates into the right file 2016-07-23 20:08:24 +01:00
Yoshax
b5d85c7d71 Converts the empty box supply crate into a shipping supplies crate 2016-07-23 20:05:59 +01: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
Peter Mörck
88c82dfe65 New stamps for warden and cargo.
Add new stamps for warden and cargo.
Replace the stamps in their areas to the corresponding new ones.
Give captain a deny stamp.
2016-07-23 15:42:08 +01:00
Yoshax
079ce6a71f Grammar fix + Ensures Christmas drop pod has trees 2016-07-23 15:23:54 +01:00
Screemonster
efc795473b Adds Flowey, Malfunctioning Flower, Soviet, Holly and Hilly sprites/options, and enables existing fish tank display. 2016-07-23 09:21:15 +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
Neerti
d659dd9208 Merge pull request #2171 from redstryker/Flannel_fix
Fixes Flannels.  Also adds a Brown Flannel
2016-07-22 19:22:44 -04:00
Yoshax
3f0a95ae3a Ensures there's no funny business with powering up emags 2016-07-22 23:05:54 +01:00
redstryker
dccc6f5713 Fixes Flannels. Also adds a Brown Flannel 2016-07-22 16:09:51 -04: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
EmperorJon
68f83c3c9e Merge pull request #2163 from Neerti/7/22/2016_ghost_texting
Communicator Texting for Ghosts
2016-07-22 19:33:46 +01:00
Neerti
c185b7c22b Merge pull request #2165 from Yoshax/removebucklecuffing
Makes handcuff resisting take priority over unbuckle resisting by removing bucklecuff resisting
2016-07-22 14:21:31 -04:00
Yoshax
b2a704904c Removes adverse effects to Tajaran drinking coffee 2016-07-22 18:07: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
Yoshax
1d0da51005 Does the old in 'n out 2016-07-22 16:11:45 +01:00
Yoshax
f493ac7e17 Removes debug lines 2016-07-22 15:53:54 +01:00
Yoshax
013a509b17 Makes handcuff resisting take priority over unbuckle resisting by removing bucklecuff resisting 2016-07-22 15:48:47 +01:00
Neerti
3e19b337de Merge pull request #2157 from redstryker/SG_Logo
Adds SolGov Logo to Paperwork and SolGov Stamps
2016-07-22 01:26:03 -04:00
Neerti
d12e9ac5fa Merge pull request #2161 from Yoshax/bigtrio
Makes FBP burn repair actually work
2016-07-22 01:25:47 -04:00
Yoshax
3a953d895f Fixes undislocation 2016-07-22 04:19:49 +01:00
Yoshax
d4d76b07a7 Makes FBP burn repair actually work 2016-07-22 03:57:29 +01:00
Yoshax
c0a60faf73 Merge pull request #2159 from Neerti/7/21/2016_technomancer_additions
Technomancer Additions/Fixes
2016-07-21 23:38:21 +01:00