Commit Graph

6173 Commits

Author SHA1 Message Date
Anewbe
55d895aa14 Merge pull request #3327 from Atermonera/Translator_Languages
Fixes a runtime with borgs and translators
2017-04-17 23:25:01 -05:00
Atermonera
e5e5c446a6 Fixes a runtime with borgs and translators 2017-04-17 21:01:42 -07:00
Anewbe
46d447e478 Merge pull request #3326 from Cerebulon/techoriginsfix
Fixes improperly formatted tech_origins
2017-04-17 20:57:28 -05:00
Cerebulon
843a59ca07 Fixes improperly formatted tech_origins for hatchet, scythe, reinforced glass, mechanical trap, kitchen utensils and kitchen knife. 2017-04-17 19:31:01 +01:00
MagmaRam
cec43bf3d2 Updates in-game EVA manual 2017-04-17 11:19:39 -05:00
Anewbe
1fbef2de5b Merge pull request #3286 from VOREStation/smooth-lighting
Port tg/paradise/goon soft-edge lighting
2017-04-15 22:52:42 -05:00
Anewbe
e455aba104 Merge pull request #3254 from Anewbe/wallets
Wallets can now hold permits.
2017-04-15 18:43:17 -05:00
Anewbe
4a203c6559 Merge pull request #3304 from VOREStation/aro-pol-wingrille
Make wingrille spawners usable
2017-04-14 23:46:20 -05:00
Arokha Sieyes
c93836745f Make wingrille spawners usable
Makes the spawner object itself block air and prevent active edges before the game starts, so you can actually use these in maps now without creating tons of active edge warnings and making ZAS zones merge everywhere. Should save a loooot of time for mappers picking those window directions.
2017-04-14 21:35:49 -04:00
Anewbe
8142c8baa4 Merge pull request #3272 from LorenLuke/PDA-ID
Can remove ID from PDA via Alt-Clicking now.
2017-04-14 17:51:42 -05:00
Neerti
cc64f0e537 Merge pull request #3255 from Anewbe/bartender_weapon_permit
Gives the bartender a weapon permit in their spawned item list
2017-04-14 01:04:19 -04:00
LorenLuke
26c3653aec Changes most '<<' to 'to_chat()' 2017-04-13 12:46:04 -07:00
Anewbe
95aff3ae40 Tweaks the message given when a weapon dulls 2017-04-12 16:22:17 -05:00
Anewbe
21d833746d Merge branch 'master' of https://github.com/PolarisSS13/Polaris into weapon_dulling 2017-04-12 16:10:58 -05:00
Leshana
45058136e2 Replace opacity = X with set_opacity(X) so that the lighting system can update propertly. 2017-04-11 22:36:48 -04:00
Neerti
920ad74e42 Merge pull request #3279 from Anewbe/borg_cuffs
Should fix borg handcuffs
2017-04-11 21:54:56 -04:00
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
Anewbe
fc8c32ea92 Should fix borg handcuffs 2017-04-11 13:12:17 -05:00
LorenLuke
031e63dd7b Can remove ID via Alt-Clicking now. 2017-04-11 00:06:40 -07: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
6a99123f51 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into weapon_dulling 2017-04-10 11:26:09 -05:00
Anewbe
736659637f Gives the bartender a weapon permit in their spawned item list. 2017-04-09 14:22:15 -05:00
Anewbe
2f4a788a39 Wallets can now hold permits. 2017-04-09 12:59:47 -05:00
Anewbe
6c169e7ad6 Adds in an Unathi-made jerky snack 2017-04-07 23:36:22 -05: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
Neerti
79a932e559 Merge pull request #3228 from Anewbe/package_bombs
Package bomb changes
2017-04-05 22:36:37 -04: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
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
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
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