Commit Graph

16603 Commits

Author SHA1 Message Date
Anewbe
1d9af61ff0 Adds a cap to losebreath 2017-11-26 21:55:55 -06:00
Anewbe
1591fdcc81 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into radiation_tweaks
# Conflicts:
#	code/game/objects/items/devices/defib.dm
2017-11-26 17:53:00 -06:00
Anewbe
ab574554d5 Makes blizzards less cold 2017-11-26 16:34:28 -06:00
Neerti
2de2391f3c Corrects block chance on alien armor. 2017-11-26 16:01:15 -05:00
Neerti
01aaccf893 Finishes UFO PoI 2017-11-26 15:10:25 -05:00
Neerti
5b0b639377 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 11/26/2017_ufo_poi
# Conflicts resolved:
#	maps/submaps/cave_submaps/cave_areas.dm
2017-11-26 12:09:55 -05:00
Neerti
7497aef295 work 2017-11-26 12:08:05 -05:00
Neerti
3dfa7edb34 Removes Cracked Asteroids from Sif Mountains
Hackfix but it works fairly well.
2017-11-26 03:57:56 -05:00
Neerti
7d0b3ffd20 Merge pull request #4332 from Cyantime/shapeshifterhair
Adds hair color changing ability for prometheans.
2017-11-26 01:27:12 -05:00
Anewbe
d524d721b9 Merge pull request #4335 from Neerti/11/22/2017_explorer_gear
Adds Exploration Equipment
2017-11-25 14:39:12 -06:00
Anewbe
36fc3dab88 Merge pull request #4333 from mistyLuminescence/sippycup
Drinkable objects!
2017-11-24 22:59:51 -06:00
Neerti
8ac2100fa2 Adds Exploration Equipment
Ports and tweaks the Explorer gear from /tg/. Recolored to remove the mining purple, instead its now a nice blue because winter, I suppose.
Adds a new survival knife that is bootknife ready.
Replaces xenoarch GPS with budget /tg/ GPS that is more useful, as it can track other GPSes.
2017-11-24 07:22:35 -05:00
Cyantime
a8eb0b53af Makes Prometheans non-monochrome, allows hair color change 2017-11-24 03:29:10 -05:00
Cyantime
0276f27d2d Fixes a bug in change_hair_color() 2017-11-23 20:15:22 -05:00
mistyLuminescence
1f84c0c8ee Drinking changes 2017-11-24 00:59:45 +00:00
Cyantime
d449b8da7f Adds hair changing ability for shapeshifters. 2017-11-23 16:44:07 -05:00
Neerti
845eae4c65 Merge pull request #4322 from Anewbe/fuck_mosin
Removes the mosin-nagant, moves the sprites
2017-11-23 03:32:37 -05:00
Anewbe
0e726d595e Removes synthblood from the surgeon borg 2017-11-23 01:46:54 -06:00
Anewbe
2b63d97add Merge pull request #4320 from Neerti/11/21/2017_submap_system
Adds Submap (PoI) Seeding Procedure
2017-11-22 18:53:25 -06:00
Mechoid
f5d1e4dab1 Merge pull request #4237 from Anewbe/stealth_things
Ninja cloak is no longer true invisibility
2017-11-22 16:13:02 -08:00
Anewbe
ec59a15bdf Creates synthblood reagent, adds it to surgeon borg hyposprays 2017-11-22 17:44:01 -06:00
Anewbe
63040bbbc5 Merge pull request #4241 from Belsima/name(name)
Stops people showing up as (as ID name)
2017-11-22 14:44:58 -06:00
Anewbe
6195247050 Changes a message 2017-11-22 01:32:45 -06:00
Anewbe
fe96740019 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into stealth_things 2017-11-22 01:15:22 -06:00
Anewbe
6e3bbd31c0 Removes the mosin-nagant, moves the sprites 2017-11-22 01:14:14 -06:00
Anewbe
62d76cba30 Merge pull request #4318 from Mechoid/Mechoid_Has_The_Keys_And_A_Brick_On_The_Pedal
Adds more Spiders. Touches cuff-code tangentially.
2017-11-22 01:13:04 -06:00
Neerti
fe33977812 Adds Submap (PoI) Seeding Procedure
Mostly ports /tg/'s method of seeding submaps into specific z-levels.
Due to the low number of submaps present, all of the PoIs are guaranteed to spawn. As more are added, this should fix itself.
2017-11-21 19:21:39 -05:00
Mechoid
d5404ae0eb Adds More Spiders. Touches cuff-code tangentially. 2017-11-21 12:59:06 -08:00
Belsima
7317669767 Mice should no longer burst your eardrums. (#4311)
* No longer bumples.

* what if grammar

* crates can bumble again
2017-11-21 13:32:21 -06:00
Neerti
cc616148e3 Merge pull request #4291 from mistyLuminescence/FisforFriendswhoDoStuffTogether
Adds bracelets!
2017-11-21 01:32:35 -05:00
Neerti
2ac5947707 Merge pull request #4306 from Anewbe/prosfab_organs
Adjusts ProsFab and MechFab design menus
2017-11-21 01:30:38 -05:00
Anewbe
fea8fcc064 Merge pull request #4310 from Neerti/11/19/2017_hunting_rounds
Adds Hunting Rounds
2017-11-21 00:29:12 -06:00
Anewbe
4739f04c5d Merge pull request #4308 from SpadesNeil/shotgun-clip-rebalance
Shotgun clip rebalance
2017-11-21 00:18:01 -06:00
Cameron653
ce87bc349c Fixes a bug with allowmodification verb 2017-11-20 20:51:27 -05:00
Cameron653
faf275e202 Fixes pAI access
fixes https://github.com/VOREStation/VOREStation/issues/2504
2017-11-20 12:54:10 -05:00
Neerti
9db34eae86 Adds Hunting Rounds
Adds a system for projectiles to inflict additional damage on specific kinds of simple animals.
Adds special bullets for certain rifles which are very effective against 'animal' SAs such as giant spiders, bears, carp, and such. The bullets do less damage to other targets such as humanoids.
Replaces the southern cross gun locker regular ammo with hunting ammo.
2017-11-19 23:59:17 -05:00
Neerti
d36d09d937 Merge pull request #4176 from Anewbe/battery_things
Swaps non-mounted recharging guns to batteries
2017-11-19 21:28:06 -05:00
Anewbe
418dda15dc Merge pull request #4148 from mistyLuminescence/fbphud
MedHUDs can identify FBPs
2017-11-19 17:40:03 -06:00
Neerti
595f874f9b Merge pull request #4264 from Anewbe/decap_defib
Decapitation now stops defibrillation
2017-11-19 17:50:03 -05:00
Anewbe
7d6332a845 Plantmonkey expansion. (#4300)
* Update diona_attacks.dm

* Diona nymphs can now wander on their own.

* So Dionae can actually wander.
2017-11-19 14:42:20 -06:00
Anewbe
a99102de94 Merge pull request #4305 from Cameron653/TESHARI_STUFF
Fixes a few borked teshari cloaks & uniforms
2017-11-19 14:41:52 -06:00
Spades
79d3ee82ab Shotgun clip rebalance
An alternative solution to the problem I highlighted in
https://github.com/PolarisSS13/Polaris/pull/4302

If this is merged, **do not merge**
https://github.com/PolarisSS13/Polaris/pull/4303
2017-11-19 14:08:03 -05:00
Anewbe
0da9a42517 Adjusts ProsFab and MechFab design menus 2017-11-19 04:25:36 -06:00
Belsima
3320690a1e I before E (#4287)
* except after C

* maroonic mistake

* Improved use of sound files.

Also more grammar.

* now with less fuckup
2017-11-19 03:00:14 -06:00
Neerti
5846f412ac Merge pull request #4290 from Anewbe/voxbeam
Tones down the Darkmatter Beam
2017-11-19 03:54:02 -05:00
Anewbe
621775a423 More absolute pathing 2017-11-19 02:49:44 -06:00
Anewbe
fd7990028f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into battery_things 2017-11-19 02:38:42 -06:00
killer653
9f067a375b Fixes a few borked teshari cloaks 2017-11-19 00:09:45 -05:00
Belsima
2a4e0a0fb7 So Dionae can actually wander. 2017-11-18 14:02:21 -05:00
Belsima
e1458c5df2 Diona nymphs can now wander on their own. 2017-11-18 14:01:30 -05:00