Commit Graph

12717 Commits

Author SHA1 Message Date
Arokha Sieyes
7e69bafa53 Another e-net tweak
Exploit where if you started breaking the net from the OUTSIDE, even if pulled away from you, you could break it. Adds a target to the do_after.
2017-04-11 21:03:09 -04:00
Leshana
249b5a904b Fix step_trigger teleporters to use forceMove()
* They previously just updated your coordinates, skipping all those things which forceMove() was invented for and causing all the same problems that mob.loc = X caused.
2017-04-10 13:02:47 -04:00
Anewbe
6c169e7ad6 Adds in an Unathi-made jerky snack 2017-04-07 23:36:22 -05:00
Neerti
42d07f67ec Merge pull request #3003 from Anewbe/cosmetic_things
Ports a bunch of fluff stuff
2017-04-07 17:30:12 -04:00
Neerti
6dbceb9725 Merge pull request #3232 from Anewbe/shrieks
Changeling shrieks now make them decloak
2017-04-07 17:16:37 -04:00
Anewbe
e9c4b5a3eb Merge branch 'master' of https://github.com/PolarisSS13/Polaris into cosmetic_things
# Conflicts:
#	icons/mob/back.dmi
#	icons/mob/items/lefthand.dmi
#	icons/mob/items/righthand.dmi
2017-04-07 16:11:50 -05:00
Belsima
ef555990c0 Gives renegade the LeMat. 2017-04-07 07:35:09 -04:00
Neerti
79a932e559 Merge pull request #3228 from Anewbe/package_bombs
Package bomb changes
2017-04-05 22:36:37 -04:00
Anewbe
5e303ab9ad Changeling shrieks now make them decloak 2017-04-05 20:53:24 -05:00
Anewbe
584fd3ed30 Missed a test var 2017-04-04 22:38:07 -05:00
Anewbe
40617b7695 Package bomb changes 2017-04-04 22:36:08 -05:00
Anewbe
66c06a02f2 Merge pull request #3225 from VOREStation/aro-pol-netbetter
Make energy nets better
2017-04-04 22:13:38 -05:00
Arokha Sieyes
1dfed9514c Make energy nets better
You can imagine them as 8-second-resist office chairs that the mob is buckled to now. You can pull them around in the net, too, since it's baaaasically like an office chair now. They can't pull themselves around like office chairs while in the net, though. Because that'd be hax. You can click them (or resist) to start tearing them up (same from the outside).

Also keep in mind the mob inside can still wreck anyone adjacent (or shoot you). That's how it was before, too. So you can't really run up and drag them to prevent escape without them punching you (shouldn't you be roleplaying all this anyway?). Switching hands interrupts the resist so no reloading, getting other weapons, using PDA etc while resisting.

Also got rid of this SUPER SNOWFLAKE VARIABLE on all mobs used literally only by energy nets.
2017-04-04 20:15:51 -04:00
Neerti
8d9b7f1135 Merge pull request #3203 from Anewbe/apron_pockets
Aprons now have pockets
2017-04-04 19:09:47 -04:00
Neerti
efbd137924 Merge pull request #3206 from Anewbe/shotgun_permit
Adds permit items, including a gun permit and a bar gun permit
2017-04-04 18:54:40 -04:00
Anewbe
6a95f6c87f Merge branch 'master' into apron_pockets 2017-04-04 17:54:38 -05:00
Neerti
aae639dcb2 Merge pull request #3211 from Anewbe/towel_things
Towels dry
2017-04-04 18:53:36 -04:00
Anewbe
d012586d32 Merge pull request #3204 from Belsima/master
Saves janitors from getting stuck
2017-04-04 17:52:30 -05:00
Anewbe
7c1f3c7977 Merge pull request #3222 from Cerebulon/handsprite_fixes_040417
Fixed various hand sprite issues.
2017-04-04 17:50:36 -05:00
Neerti
e620f26d02 Merge pull request #3220 from Anewbe/chief_of_security
Adds Chief of Security alt title for HoS
2017-04-04 15:35:56 -04:00
Cerebulon
340845babd Fixed various hand sprite issues.
Several circuit boards/modules did not have sprites despite hands sprites existing.
Green and pink lunch/tool boxes appeared in the wrong place in the right hand.
Fixed defib sprite for new code, and added jumper cable sprite.
2017-04-04 08:29:53 +01:00
Neerti
6126cf5eaf Merge pull request #3218 from Anewbe/automute
Automute shouldn't go off if you didn't type anything
2017-04-03 18:35:02 -04:00
Anewbe
acf10ccfe9 Adds Chief of Security alt title for HoS 2017-04-03 15:14:25 -05:00
MagmaRam
0d7d2a9fb3 Merge pull request #3207 from Anewbe/jobs
Updates the job files to meet standards
2017-04-03 15:11:07 -05:00
Anewbe
1e7bf50a4c Automute shouldn't go off if you didn't type anything 2017-04-03 14:14:52 -05:00
Anewbe
5dcd63b6b9 Merge pull request #3213 from VOREStation/aro-pol-nanosize
Fix nanopaste item size
2017-04-02 19:46:17 -05:00
Arokha Sieyes
4807b4e6e0 Fix nanopaste item size
I'm pretty sure this is an oversight, rather than a balance thing. Nanopaste is too big to fit in boxes or anywhere else, but seems to be identical to all other 10-stack items like medical stacks in other regards. It should probably be the same size as the other 10-stack items.

Even the icon seems to suggest this, since right now it is just as big as an entire box, though the icon seems to be more like toothpaste-tube and looks awkward sitting in the huge backdrop inventory space.
2017-04-02 19:33:25 -04:00
Anewbe
21f2bfc12d Towels dry 2017-04-02 17:34:52 -05:00
Anewbe
c21223e334 Adds permit items, including a gun permit and a bar gun permit 2017-04-02 14:09:53 -05:00
Anewbe
b3b8645d4c Updates the job files to meet standards 2017-04-02 14:09:16 -05:00
Belsima
3109cae86e I missed a B. 2017-04-02 12:07:54 -04:00
Anewbe
1bc8b9d716 Merge pull request #3200 from Atermonera/Translator_Languages
Translators and animal languages
2017-04-02 11:04:22 -05:00
Belsima
5efb8bf05d Makes mopbucket climbable. 2017-04-02 11:42:13 -04:00
Belsima
64a1dc7f6d Makes janicart climable. 2017-04-02 11:41:06 -04:00
Anewbe
8e9db2b7d4 Aprons now have pockets 2017-04-02 00:28:20 -05:00
Atermonera
d9c68e5b9b Translators still check against hiveminds 2017-04-01 17:49:34 -07:00
Atermonera
971cd2da30 Translators don't understand animals and other languages that recorders can't record. 2017-04-01 16:48:01 -07:00
Neerti
89088cdbda Merge pull request #3199 from Anewbe/flower_crowns
Wooden circlets can now be worn as hats
2017-04-01 17:47:09 -04:00
Anewbe
1ea5252f5d Merge pull request #3181 from VOREStation/vplk-pipelayer
Modernize the automatic pipe layer
2017-04-01 15:59:05 -05:00
Anewbe
27b1db523e Wooden circlets can now be worn as hats 2017-04-01 15:31:06 -05:00
Anewbe
7bb3f5fbb7 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into cosmetic_things
# Conflicts:
#	code/datums/supplypacks/medical.dm
#	code/game/objects/structures/crates_lockers/closets/wardrobe.dm
#	code/modules/clothing/shoes/miscellaneous.dm
#	code/modules/clothing/suits/labcoat.dm
#	icons/mob/back.dmi
#	icons/mob/feet.dmi
#	icons/mob/human_face.dmi
#	icons/mob/items/lefthand.dmi
#	icons/mob/items/righthand.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/shoes.dmi
#	icons/obj/clothing/suits.dmi
#	icons/obj/storage.dmi
#	maps/northern_star/polaris-2.dmm
#	maps/northern_star/polaris-5.dmm
2017-04-01 12:45:45 -05:00
MagmaRam
4000be7ec5 Merge pull request #3191 from Anewbe/flashlight_options
Adds a few more cosmetic flashlights
2017-03-31 20:07:42 -05:00
Anewbe
81aec38408 Fixes a text thing 2017-03-31 19:40:40 -05:00
Anewbe
ca47d37d2f Adds a few more cosmetic flashlights 2017-03-31 18:50:00 -05:00
Anewbe
72adee8fb8 Adds a bunch of things to cargo 2017-03-31 00:23:27 -05:00
MagmaRam
34e398d328 Merge pull request #3175 from Anewbe/hands_things
Device Cell QOL
2017-03-30 20:49:24 -05:00
Anewbe
d59f0f1dc4 Merge pull request #3152 from VOREStation/aro-pol-bodymarks
Adds Body Markings
2017-03-30 20:13:15 -05:00
MagmaRam
19a9a8a413 Merge pull request #3172 from Anewbe/jumper_cables
Adds in Jumper Cables for FBP reviving
2017-03-30 19:46:26 -05:00
MagmaRam
850155bfb7 Merge pull request #3167 from Anewbe/cigarette_sprites
Cigarettes and cigars have a "Burnt but not done" sprite
2017-03-30 19:37:27 -05:00
Leshana
c6d9f019d0 Prevent infinate steel generation by limiting pipe recycling, and not starting with steel. 2017-03-30 20:37:25 -04:00