Commit Graph

26315 Commits

Author SHA1 Message Date
Arokha Sieyes
87b3376c37 Merge pull request #1359 from Yoshax/disks
Adds DSI Synth disks to advanced robolimbs cargo crate
2017-04-07 13:20:59 -04:00
Yoshax
5f049fda55 Adds DSI Synth disks to advanced robolimbs cargo crate 2017-04-07 16:50:26 +01:00
Arokha Sieyes
4c979d9950 Merge pull request #1356 from VOREStation/aro-infomorphs
Adds Sleevecards
2017-04-06 18:28:06 -04:00
Arokha Sieyes
e01278a72f Communicator fixes 2017-04-06 18:08:13 -04:00
Arokha Sieyes
7f8e013178 Merge pull request #1354 from DemgelZalvine/Synthwork_Branch
Synthwork Species Update!
2017-04-06 18:03:13 -04:00
Arokha Sieyes
2ed665cbd0 Autolathe card creation 2017-04-06 18:00:18 -04:00
Arokha Sieyes
369075c3dd Sleevecards! 2017-04-06 17:59:58 -04:00
Zalvine
474728e540 fixing this all for PR, whee. (+1 squashed commits)
Squashed commits:

[3981ec7311] fixing this all for PR, whee.
2017-04-06 09:27:13 -05:00
Arokha Sieyes
8d30949ddf Merge pull request #1345 from VOREStation/aro-sync
Updates permits
2017-04-05 01:00:15 -04:00
Arokha Sieyes
4ae25d033e Merge pull request #1347 from VOREStation/aro-impdoafter
Update do_after in backup implanter
2017-04-05 00:33:24 -04:00
Arokha Sieyes
8c7fad0fa9 Updates custom items to reflect permit status 2017-04-05 00:28:09 -04:00
Arokha Sieyes
7c5e637235 Update do_after in backup implanter
It doesn't check for target proximity, but it should.
2017-04-05 00:21:10 -04:00
Arokha Sieyes
58cbfefd78 Updates permits
Two permit updates
2017-04-04 22:19:15 -04:00
Leshana
47b41582c3 Merge branch 'master' into vplk-persist 2017-04-04 21:44:28 -04:00
Leshana
39cf9a9a9b Use species for determining which organs to persist.
Also added some safety checks, and better handled digitized brains.
2017-04-04 20:52:26 -04:00
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
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
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
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
d012586d32 Merge pull request #3204 from Belsima/master
Saves janitors from getting stuck
2017-04-04 17:52:30 -05: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
Anewbe
7c1f3c7977 Merge pull request #3222 from Cerebulon/handsprite_fixes_040417
Fixed various hand sprite issues.
2017-04-04 17:50:36 -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
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
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
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
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
b38986b4b7 Merge pull request #3209 from Atermonera/master
FBPs can have numbers in their names.
2017-04-03 13:56:06 -05:00