Commit Graph
25020 Commits
Author SHA1 Message Date
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
AnewbeandGitHub fec77f8780 Merge pull request #3240 from Belsima/renny
Gives renegade the LeMat.
2017-04-07 15:43:50 -05:00
SinTwo 828cffb25f If observing before roundstart, you may respawn. 2017-04-07 12:52:22 -04:00
BelsimaandGitHub ef555990c0 Gives renegade the LeMat. 2017-04-07 07:35:09 -04:00
NeertiandGitHub 79a932e559 Merge pull request #3228 from Anewbe/package_bombs
Package bomb changes
2017-04-05 22:36:37 -04:00
NeertiandGitHub 3a0dadb1cb Merge pull request #3229 from Anewbe/item_slowdown
Tweaks mob slowdown
2017-04-05 22:35:53 -04:00
NeertiandGitHub 6a1451f5f0 Merge pull request #3230 from PolarisSS13/revert-3136-master
Revert "Updates drone respawn time."
2017-04-05 22:34:46 -04:00
NeertiandGitHub dbbd1f946e Merge pull request #3231 from Anewbe/headbutt
Renames the proc for headbutting
2017-04-05 22:34:23 -04:00
Anewbe ec7dbc1930 Renames the proc for headbutting 2017-04-05 15:55:35 -05:00
AnewbeandGitHub 5dfc85e629 Merge pull request #3226 from Yoshax/lemat
Adds a LeMat Revolver
2017-04-05 13:32:16 -05:00
AnewbeandGitHub 0184cea5f2 Revert "Updates drone respawn time." 2017-04-05 12:29:15 -05:00
Yoshax 530a2b5c60 Adds a LeMath Revolver 2017-04-05 14:29:24 +01:00
Anewbe 5c9fce07f4 Renames the species var 2017-04-04 23:13:19 -05:00
Anewbe 1513842608 Tweaks mob slowdown 2017-04-04 23:02:56 -05:00
AnewbeandGitHub 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
AnewbeandGitHub 66c06a02f2 Merge pull request #3225 from VOREStation/aro-pol-netbetter
Make energy nets better
2017-04-04 22:13:38 -05:00
AnewbeandGitHub 22c2e852ad Merge pull request #3224 from VOREStation/aro-pol-satweaks
Simple Animal Tweaks
2017-04-04 20:51:43 -05:00
LeshanaandArokha Sieyes 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
NeertiandGitHub 8d9b7f1135 Merge pull request #3203 from Anewbe/apron_pockets
Aprons now have pockets
2017-04-04 19:09:47 -04:00
NeertiandGitHub 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
NeertiandGitHub 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
AnewbeandGitHub 6a95f6c87f Merge branch 'master' into apron_pockets 2017-04-04 17:54:38 -05:00
NeertiandGitHub aae639dcb2 Merge pull request #3211 from Anewbe/towel_things
Towels dry
2017-04-04 18:53:36 -04:00
NeertiandGitHub 0c6b67a30d Merge pull request #3214 from Anewbe/fbp_limb_tweak
Robolimbs last longer without negative effects
2017-04-04 18:53:22 -04:00
AnewbeandGitHub d012586d32 Merge pull request #3204 from Belsima/master
Saves janitors from getting stuck
2017-04-04 17:52:30 -05:00
AnewbeandGitHub 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
AnewbeandGitHub 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 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
NeertiandGitHub 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
NeertiandGitHub c52bab3439 Merge pull request #3201 from Anewbe/vox_weapons
Tweaks the Vox weapons
2017-04-03 21:13:19 -04:00
Anewbe bfb3871ec3 Adds hollowpoint rounds, for bears and such 2017-04-03 18:27:19 -05:00
NeertiandGitHub 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
MagmaRamandGitHub 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
AnewbeandGitHub 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
AnewbeandGitHub 5dcd63b6b9 Merge pull request #3213 from VOREStation/aro-pol-nanosize
Fix nanopaste item size
2017-04-02 19:46:17 -05:00
Anewbe cb877ab09a Robolimbs last longer without negative effects 2017-04-02 19:35:31 -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
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
Anewbe 21f2bfc12d Towels dry 2017-04-02 17:34:52 -05:00
Atermonera 67d9f03e4d FBPs can have numbers in their names. 2017-04-02 13:53:49 -07: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
AnewbeandGitHub 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