Commit Graph

12079 Commits

Author SHA1 Message Date
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
EmperorJon
cdb09d2946 Merge pull request #2188 from Yoshax/autolathe
Rehauls some autolathe code
2016-07-25 10:42:30 +01:00
Neerti
400a437690 Oddy Sleeper Change
The sleeper for the Odysseus mech now takes five seconds instead of two to load someone inside.
2016-07-25 04:10:42 -04: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
Yoshax
7e453226dc Rehauls some autolathe code 2016-07-24 22:02:58 +01: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
Yoshax
372114be14 Merge pull request #2175 from Screemonster/AI_displays
Additional AI status displays
2016-07-23 22:59:32 +01: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
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
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
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
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
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
Neerti
09a57710a2 Technomancer Additions/Fixes
Moves spell HUD so it doesn't cover instability warning.
Makes Instability radiate out towards other humans at sufficently high amounts.  People radiating instability will glow purple light.  It is adviced to keep your distance or you will get instability as well.
Mark can no longer be cast on the admin z-level.
Adds Gambit, a spell which will randomly give you (almost) any spell that exists.
Shield now causes a bit of instability when blocking.
Recall will bring anyone who is grabbed along for the ride when cast.
Disposable Teleporters now function correctly.
Instability decays faster.
2016-07-21 18:22:15 -04:00
EmperorJon
1334b01693 Merge pull request #2132 from Cameron653/master
Makes biogenerator be accurate about a few product costs
2016-07-20 12:12:07 +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
EmperorJon
c1cf145707 Merge pull request #2151 from Neerti/7/18/2016_technomancer_stuff
More Technomancer Work
2016-07-20 12:09:39 +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
Neerti
e1e0933657 More Technomancer Work
Adds two new spells;
Track: which functions similarly to a pinpointer for technomancer objects and apprentices.  With a scepter, it will be able to track anyone as well.
Targeting Matrix: which assists in targeting with whatever is in your off-hand, for a price in instability and energy per shot.
Adds Gloves of Regeneration, which passively trades healing for hunger, as well as stabbing your hands with needles.  They also insulate your hands.
Adds Boots of Speed, which act as no-slips and make the wearer run slightly faster than normal.
Adds the new gun sounds to Audible Deception.
2016-07-18 22:03:02 -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
EmperorJon
1476f525f7 Merge pull request #2139 from Neerti/7/15/2016_more_technomancer
Some More Technomancer Additions
2016-07-15 20:30:20 +01:00
Neerti
b93bf797f4 Some More Technomancer Additions
Adds the Recycling and Summoner cores to the catalog, which I somehow forgot to do earlier.
Adds an instability modifer for different cores.
Adds several new healing spells, for dealing with internal organ troubles, as well as for dealing with robotic FBP healing.
Makes various healing spells cheaper in the catalog.
2016-07-15 12:18:31 -04:00
Anewbe
4e25ac5187 Fixes bashing doors 2016-07-15 09:33:22 -05:00
Anewbe
a79c8d8768 Unathi knives can now be wielded in unison 2016-07-14 18:14:58 -05:00
Cameron653
b3b2fa5251 Update biogenerator.dm 2016-07-13 21:01:41 -04:00