Commit Graph

26773 Commits

Author SHA1 Message Date
Anewbe
247642057d Merge pull request #4337 from Belsima/vendors
Various vending fixes.
2017-11-26 13:04:37 -06:00
MisterLayne
ab83bb90be One Crew Member 2017-11-26 12:28:59 -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
Belsima
6b784accfd Bible additions. 2017-11-24 21:01:33 -05:00
Belsima
e425a3bd21 what if COmpile 2017-11-24 20:48:06 -05:00
Belsima
27a6fa9e7b Adds signs. 2017-11-24 20:34:42 -05:00
Belsima
42627cbc76 Various vending fixes. 2017-11-24 20:29:32 -05: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
BillyBangles
f1280b234b Adds rotate verb for pianos (#4324)
* Adds rotate verb and directional piano sprites

* fixes ghost rotation

I forgot Polaris and Bay handle ghosts quite differently. This should fix that.

* mice and restrained people cannot rotate a piano

i can break these cuffs
2017-11-23 12:58:43 -06: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
Neerti
9db0451aee Merge pull request #4328 from Cyantime/patch-2
Tools used on railings now use their correct sounds
2017-11-22 19:24:43 -05:00
Mechoid
7c0a92cb3c Merge pull request #4317 from Anewbe/hacked_borg
Hacked borgs can no longer be locked down
2017-11-22 16:13:54 -08: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
Cyantime
e85191acfd Tools used on railings now use their correct sounds 2017-11-22 18:38:30 -05:00
Cyantime
9ba6d5759a Fixes 'reques console' 2017-11-22 18:25:49 -05: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
Mechoid
c59d426413 Merge pull request #4323 from PolarisSS13/revert-4288-blubois
Revert "Various vendor fixes + use of unused sprites."
2017-11-21 23:23:54 -08: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
Anewbe
51dc3dca93 Revert "Various vendor fixes + use of unused sprites." 2017-11-22 01:02:16 -06:00
Anewbe
1997cc34ce Merge pull request #4288 from Belsima/blubois
Various vendor fixes + use of unused sprites.
2017-11-22 01:02:13 -06:00
Anewbe
fc33c09a22 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into hacked_borg 2017-11-21 23:20:15 -06:00
Anewbe
17a5b70d38 Hacked borgs can no longer be locked down 2017-11-21 23:19:57 -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
Layne
6bdadd58e8 fuck 'usr <<' (#4245) 2017-11-21 15:22:05 -06: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
Anewbe
ce16c391fa Merge pull request #4313 from PrismaticGynoid/storemoreplaces
Increases maximum stored camera locations
2017-11-21 13:31:54 -06:00
Neerti
99e48c9c51 Merge pull request #4281 from Belsima/ELLIS
Adds a message to the IRC for round start.
2017-11-21 01:33:33 -05: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
Neerti
a5d3f92a28 Merge pull request #4316 from Cameron653/patch-1
Fixes a bug with allowmodification verb
2017-11-21 01:17:19 -05:00
Cameron653
ce87bc349c Fixes a bug with allowmodification verb 2017-11-20 20:51:27 -05:00
Marina Gryphon
2489497f81 Maybe fixes #4220. 2017-11-20 18:42:05 -06:00