Commit Graph

16690 Commits

Author SHA1 Message Date
Arokha Sieyes
909b02444d Merge pull request #1343 from VOREStation/aro-sync
Polaris Sync
2017-04-04 20:52:03 -04:00
Arokha Sieyes
0d76e76671 Merge pull request #1330 from VOREStation/aro-vantag
"Event Character" HUD
2017-04-04 20:40:23 -04:00
Arokha Sieyes
03edbf785a Merge pull request #1342 from VOREStation/aro-netbetter
Make energy nets better
2017-04-04 20:40:13 -04:00
Arokha Sieyes
85a489b9b6 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync 2017-04-04 20:25:00 -04:00
Arokha Sieyes
df84a2329a Renames V-ANTAG to Event 2017-04-04 20:22:09 -04:00
Arokha Sieyes
c3bd425bf3 Merge pull request #1341 from VOREStation/aro-simplefixes
Simple Animal Tweaks
2017-04-04 20:19:10 -04:00
Leshana
3530f71530 Prevent pets from resisting out of being buckled to chairs.
* Simple animals won't resist out of being buckled while idle.  This lets them be buckled on shuttles etc. They still will resist out when they lock onto a target etc.
2017-04-04 20:16:38 -04: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
Arokha Sieyes
019702ebb9 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:14:37 -04:00
Leshana
039fc4cc2f Prevent pets from resisting out of being buckled to chairs.
* Simple animals won't resist out of being buckled while idle.  This lets them be buckled on shuttles etc. They still will resist out when they lock onto a target etc.
2017-04-04 19:17:45 -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
d275142e7a Merge pull request #3219 from Anewbe/negative_armor_pen
Adds hollowpoint rounds, for bears and such
2017-04-04 18:55:59 -04:00
Anewbe
6a95f6c87f Merge branch 'master' into apron_pockets 2017-04-04 17:54:38 -05:00
Neerti
0c6b67a30d Merge pull request #3214 from Anewbe/fbp_limb_tweak
Robolimbs last longer without negative effects
2017-04-04 18:53:22 -04:00
Anewbe
9178422779 Merge pull request #3212 from VOREStation/aro-pol-cellicon
Make cells show correct icon when they spawn
2017-04-04 17:50:56 -05:00
Arokha Sieyes
87af1cdcc7 Merge pull request #1340 from VOREStation/aro-shutfix
Rogueminer Improvements
2017-04-04 17:47:11 -04:00
Arokha Sieyes
aed4bfb3c4 Simple Animal Tweaks
They can resist out of closets, buckles, and when calling for help, if the helpers can see the issue, they don't just follow the caller, they attack the issue. This means that retaliate class mobs properly assist in fights for the mob who is retaliating.
2017-04-04 17:37:15 -04:00
Arokha Sieyes
dd04713374 Simple Animal Tweaks
They can resist out of closets, buckles, and when calling for help, if the helpers can see the issue, they don't just follow the caller, they attack the issue. This means that retaliate class mobs properly assist in fights for the mob who is retaliating.
2017-04-04 17:36:28 -04:00
Arokha Sieyes
52cb568004 Rogueminer Improvements
Shuttle is always vacuum, no airlock cycling now, and belter mobs won't fight each other, only you.
2017-04-04 15:20:45 -04:00
Arokha Sieyes
df2ac10887 Merge pull request #1329 from Poojawa/sergal-markings
Sergal Markings
2017-04-04 15:00:44 -04:00
Arokha Sieyes
c22bfb8c4e Merge pull request #1332 from Poojawa/sergal-hardsuits
sergal hardsuits
2017-04-04 09:44:12 -04:00
Leshana
f17ea64bbe Enables round-to-round persistence of a few aspects of characters.
* More accurately, it automates updating your character setup.  None of this code does anything you could not already do manually on the Character Setup screen, it simply does it automatically for you.
* Specifically a few things are saved either at round end or when you cryo:
  * Your late-join spawn location is determined by which cryo/elevator/etc you used to leave last time.  Departing thru the elevators will set your spawn location to elevators etc.
  * Your weight is saved (also any extra or deficient nutrition is resolved into weight gain/loss)
  * Your limbs settings are updated based on your status at end of round (whether limbs are normal, missing, robotic, etc)
  * Your markings are saved so they will be the same as when they were at end of round.
* ALL of these changes are optional, toggled on the VORE tab of character setup.
* Replaced hard coded numbers for weight gain with constant defines.
2017-04-04 07:33:09 -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
Poojawa
b52857e175 Update loadout_uniform_vr.dm
misplaced comma
2017-04-03 23:04:31 -05:00
Poojawa
e44e1c6c44 sergal hardsuits 2017-04-03 22:59:40 -05:00
Neerti
c52bab3439 Merge pull request #3201 from Anewbe/vox_weapons
Tweaks the Vox weapons
2017-04-03 21:13:19 -04:00
Arokha Sieyes
9e90a293ec VANTAG Hud stuff 2017-04-03 19:35:09 -04:00
Anewbe
bfb3871ec3 Adds hollowpoint rounds, for bears and such 2017-04-03 18:27:19 -05: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
1e7bf50a4c Automute shouldn't go off if you didn't type anything 2017-04-03 14:14:52 -05:00
Anewbe
b38986b4b7 Merge pull request #3209 from Atermonera/master
FBPs can have numbers in their names.
2017-04-03 13:56:06 -05:00
Yoshax
cd3c77c0b9 Fixes a small body marking thing issue 2017-04-03 18:41:42 +01:00
Arokha Sieyes
cf8a7a8bee Merge pull request #1328 from VOREStation/aro-cdtrans
Replace CD's hand tele with Translocator
2017-04-03 10:54:40 -04:00
Poojawa
57aa3dfd14 Sergal Markings 2017-04-03 04:14:22 -05:00
Arokha Sieyes
32455d3abf Slight oversight on transloc failure chance
Needs to have at least 2 beacons, since otherwise this will pick from an empty list.
2017-04-03 02:47:45 -04:00
Arokha Sieyes
9099b93ae8 Replace CD's hand tele with Translocator
Because nobody wants to be randomly spaced for using a tool given to you. Also rebalances translocataor slightly. 5% failure chance, but only to send you to another beacon, not to space you, unless of course you throw one of the beacons into space, so don't do that. Also requires recharges now and has a weapon device cell. Three uses per charge.
2017-04-03 02:40:15 -04:00
Arokha Sieyes
c57e6e75b7 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-smallsync
# Conflicts:
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	code/modules/mob/living/simple_animal/animals/parrot.dm

Line ending changes?
2017-04-02 23:25:59 -04:00
Arokha Sieyes
7744777ea4 Merge pull request #1325 from VOREStation/aro-netgun
Adds the 'Hunter' Capture Gun
2017-04-02 21:39:16 -04:00
Anewbe
cb877ab09a Robolimbs last longer without negative effects 2017-04-02 19:35:31 -05:00
Arokha Sieyes
e69f5bf981 Make cells show correct icon when they spawn
Initialize is great for cells sitting on a counter or something when the map loads. But not really for cells in guns that R&D prints and stuff. Kinda needs to be in New().
2017-04-02 19:28:11 -04:00
Arokha Sieyes
a06a1af3c2 Change my flash pistol to Hunter 2017-04-02 19:26:39 -04:00
Arokha Sieyes
cdf9fd476c Adds the 'Hunter' Capture Gun
Dual mode stun-beam and net launcher, craftable in R&D. Would be legal for security to have on green since it's non-lethal. The stun beam has 10 shots like the taser, and the net launcher has 2 (uses the same energy). So basically 5 stun+1 net, or 2 nets, or 10 stuns.

Uses a new overlay system for updating it's icon rather than the "have one state for every possible combination" to prevent a huge mess of iconstates. Maybe Joan could look at this and use it sometime.
2017-04-02 19:25:27 -04:00
Arokha Sieyes
b7ed0aa156 Make cells show correct icon when they spawn
Initialize is great for cells sitting on a counter or something when the map loads. But not really for cells in guns that R&D prints and stuff. Kinda needs to be in New().
2017-04-02 19:21:45 -04:00
Cameron653
69223ac8f4 Fixes on-mob sprites
Item_state wasn't being set before, causing the on-mob sprites not to work (How the hell did this slip past me)
Also, removed a duplicate path for merc/taur
2017-04-02 17:49:37 -04:00
Atermonera
67d9f03e4d FBPs can have numbers in their names. 2017-04-02 13:53:49 -07:00
Anewbe
b0ba6c48c1 Merge pull request #3205 from Atermonera/Translator_Languages
Restricts animal languages
2017-04-02 12:25:53 -05:00
Atermonera
e7fb196a26 Restricts animal languages 2017-04-02 10:16:15 -07:00
Anewbe
1bc8b9d716 Merge pull request #3200 from Atermonera/Translator_Languages
Translators and animal languages
2017-04-02 11:04:22 -05:00
Anewbe
8e9db2b7d4 Aprons now have pockets 2017-04-02 00:28:20 -05:00
Cameron653
77f6d2fd78 Makes Carthatoline actually creatable
The ID for dylovene is "anti_toxin" not "dylovene"
2017-04-02 01:26:40 -04:00