Commit Graph

29125 Commits

Author SHA1 Message Date
Neerti
25e31a7480 Merge pull request #4136 from Anewbe/ahelp_bugfixes
Hopefully fixes ahelps
2017-10-22 01:31:15 -04:00
Anewbe
6543723c6e Merge pull request #4124 from Belsima/giantmobs
Fixes giant mobs and adds more.
2017-10-22 00:26:58 -05:00
Mechoid
48d8375cac Incendiary >= 2 projectile fixes. (#4127)
* A whole load of things.

* Fixes the SM Rod's travel distance.

* Flame it again, Tony. Fixes flamefuel spawning on rock-wall turf.
2017-10-22 00:26:33 -05:00
Spades
f83ede7428 Merge pull request #2314 from VOREStation/TRAITS_CLARITY_AND_CHANGES
Traits clarity, changes, and additions.
2017-10-22 00:31:45 -04:00
Anewbe
7963f539db Hopefully fixes ahelps 2017-10-21 23:27:24 -05:00
Anewbe
4a277ae5e2 Level Two Infections actually hurt now 2017-10-21 22:37:41 -05:00
Spades
e36beffc16 Merge pull request #2344 from VOREStation/Cameron653-patch-2
Vampire Stuff
2017-10-21 23:29:34 -04:00
Spades
75a9be5307 Merge pull request #2346 from Cameron653/HARD_VORE
Brutal Predation & minor adjustments.
2017-10-21 23:29:07 -04:00
Cameron653
39a47803b8 Removes the bloodsuck and shred from Prometheans 2017-10-21 23:18:56 -04:00
Spades
0e82f4f3bf Merge pull request #2332 from Verkister/backuppery
Adds a mind backup nifsoft and fixes sleevemate nif and quit issues.
2017-10-21 23:17:49 -04:00
Spades
58847349de Merge pull request #2326 from VOREStation/Cameron653-patch-1
Makes soulcatcher actually purchasable for most jobs
2017-10-21 23:17:28 -04:00
Spades
838654f9d5 Merge pull request #2339 from Verkister/unbrutal
Removes the minimum limits to gurgle damage and scales the nutrition gain with them.
2017-10-21 23:15:53 -04:00
Spades
433627ca15 Merge pull request #2335 from Yewmi/panda-time
Adds character options for panda ears and eye markings
2017-10-21 23:14:18 -04:00
Spades
8737b2b65e Merge pull request #2338 from Yewmi/halloween-punkin
Adds halloween pumpkins and jack-o'lanterns
2017-10-21 23:13:43 -04:00
killer653
c85fe528d6 REST OF THE OWL- I MEAN CODE 2017-10-21 22:42:39 -04:00
killer653
d5465eab5f Merge remote-tracking branch 'refs/remotes/VOREStation/master' into HARD_VORE 2017-10-21 21:20:39 -04:00
Cameron Lennox
0af2a17acc Hard vore code.
EIGHT HOURS OF WORK. AAAAAAAAAHHHHHHHHHHHH
Now time to add it to traits & other species.
2017-10-21 20:38:08 -04:00
Cameron653
af4d6d7368 Clears out the rest of them and leaves comments.
Of where to find them.
2017-10-21 15:38:19 -04:00
Cameron653
eb6238f613 Removes duplicate heart
https://github.com/PolarisSS13/Polaris/blob/master/code/modules/organs/internal/heart.dm
2017-10-21 15:24:08 -04:00
Anewbe
6a52111680 Merge pull request #4116 from Neerti/10/20/2017_syndie_borgs_are_back
Syndicate Borgs II, Return of the Salt
2017-10-21 13:58:52 -05:00
Anewbe
a0ed4365f0 Rebalances Firestorm 2017-10-21 13:58:19 -05:00
Neerti
324afc55ba Update ghost_query.dm 2017-10-21 14:51:07 -04:00
Neerti
c1f971a1e2 Merge pull request #4120 from Anewbe/costume_tweaks
Improves Halloween costumes, tweaks the admin verb for equipping
2017-10-21 14:29:52 -04:00
Yoshax
d58293749e Reverts Ace's changes to make parapens functional 2017-10-21 17:50:07 +01:00
MisterLayne
b7dcac5057 Adds more emotes. 2017-10-21 11:11:00 -04:00
Neerti
aa9231d0fa Update syndicate.dm 2017-10-21 11:02:05 -04:00
Neerti
083369c614 Update borghydro.dm 2017-10-21 10:42:53 -04:00
Belsima
8363f34044 Recolors some CentComm items to use NT colors. 2017-10-21 09:21:20 -04:00
Belsima
5dcd04cfe8 Adjusts giant mobs. 2017-10-20 20:02:42 -04:00
Mechoid
d0d7f17b08 Allows the Flamethrower and Fireaxe to be held in the firebug suit's storage. 2017-10-20 14:44:32 -07:00
Cameron653
25ae5840e4 Lets blood bags be drank in increments 2017-10-20 17:16:22 -04:00
Cameron653
43f7518e79 Lets vampires actually drink blood 2017-10-20 17:14:33 -04:00
Anewbe
4034a0aaa7 Makes footsteps less common on walk intent 2017-10-20 16:13:46 -05:00
Anewbe
3f2d996f7d Improves Halloween costumes, tweaks the admin verb for equipping 2017-10-20 16:01:09 -05:00
Cameron653
d1e939a50d Adds holo collar to loadout 2017-10-20 16:24:29 -04:00
Mechoid
1770d1ef76 Adds the Mercenary Fire-fighter suit. 2017-10-20 12:43:19 -07:00
Neerti
12ae485e48 Merge pull request #4117 from Anewbe/glass_bugfix
Should be able to transfer reagents between glasses again
2017-10-20 15:18:10 -04:00
Neerti
05f83497fd Merge pull request #4105 from Anewbe/event_manager
Does work on the event manager role again
2017-10-20 15:16:50 -04:00
Spades
e8a9bb7ffc Merge pull request #2325 from VOREStation/Cameron653-patch-3
Assistant fix
2017-10-20 14:54:07 -04:00
Verkister
c430022447 I actually made the lower limit obsolete with the scaling oops 2017-10-20 21:19:23 +03:00
mistyLuminescence
ae308a3a91 Reworks cryopod storage 2017-10-20 19:14:45 +01:00
Verkister
c65a281ca4 Update otie.dm 2017-10-20 21:07:15 +03:00
Anewbe
52cbe08c76 Should be able to transfer reagents between glasses again 2017-10-20 12:56:07 -05:00
Verkister
d58cacc85a Scales the nutrition gain according to gurgledamage. 2017-10-20 20:50:02 +03:00
Verkister
32b8cbc080 Okay made it 1 minimum for both. 2017-10-20 20:39:01 +03:00
Verkister
ee83f721c4 Adds rng backgrounds to character setup preview.
-They swap upon every preview refresh.
-Current selection comes with full black, full white, 'steel' floor tiles, white flor tiles, bare plating, and reinforced floor.
-We'll see if I feel like figuring out how to make a proper selection button later.
2017-10-20 20:35:21 +03:00
Neerti
9c0ac5ec2a Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 10/20/2017_syndie_borgs_are_back 2017-10-20 13:26:06 -04:00
Neerti
1aff3fc8c0 Syndicate Borgs II, Return of the Salt
Adds an option in mercenary uplinks to purchase three different 'classes' of drones.
See PR for more details.
2017-10-20 13:01:45 -04:00
Verkister
69cbcf21ba trim 2017-10-20 19:14:04 +03:00
Verkister
000dcef006 Replaces live otie grabs with a different feature.
-Grabbing a live otie no longer does the classic "break sprite offset and piss off the mob" function.
-Instead it now just leads to a disapproving growl and a loss of bonding if the grabber had befriended the thing before.
-Grabbing a dead one does the old stuff tho so ya can still 'dispose' of the bodies or whatever.
-Serious there's always someone who goes grabbing the nonhostile ones fgshjd :v
2017-10-20 18:50:09 +03:00