Commit Graph

1352 Commits

Author SHA1 Message Date
killer653 2755d3ddb1 HOTFIX 2017-09-21 20:26:48 -04:00
Anewbe 79581c5341 Merge pull request #3877 from Neerti/9/17/2017_trash_pile_port
Ports Trashpiles
2017-09-19 01:26:20 -05:00
Neerti 1c264176d9 Ports Trashpiles
Mostly ports Vore's Trashpile code, and made more generic, as I plan to use these for surface loot later.
Adds mold reagent to give a consequence to eating food you found in the garbage.
These aren't mapped in but I or someone else can do that later.
2017-09-18 06:34:10 -04:00
Spades 2ff8f3b0e1 Response to feedback
Dart gun is back, voice changer is gone (from this list)
2017-09-18 03:59:06 -04:00
Spades d5b39e97c3 Trash pile tweaks
- Adds zip gun
- Removes dart gun (I don't know what this even does)
- Adds voice changer mask
- Removes vault moneybag (glitchy)
- Adds makeshift metal armor
- Removes press armor (confusing for SOP)
2017-09-18 03:18:23 -04:00
Woodratt 3e90725a45 Catwalks and Railings
Added catwalks and railings. Ported from Vorestation who ported them from Eris.

Note, catwalks can be placed on plating (as is seen on the vorestation map Tether) and is done so here as well. However it doesn't seem like it is possible to build said catwalks on plating. Did not bother to adjust this at this time. Something to sort in the future.

Adjusted SC station dmm to use both the railing and catwalks as well as a couple fixes for the floor tile adjustment in a earlier commit.
2017-09-16 00:54:33 -07:00
killer653 bddfa16f82 Polaris sync 2017-09-15 21:17:34 -04:00
Belsima fb0e4d3cf9 General uniform updates. (#3814)
* General uniform update.

* Maps in bathrobe.

* Revert "Maps in bathrobe."

This reverts commit 9cbe47671da7a452cb5ac040aeefdcb98dbe180a.

* Fixes cheongsams and maps in the bath robe.

* Removes unintentionally added sprite.

* Assorted bugfixes.
2017-09-15 17:14:20 -05:00
Spades 3a89fa8f4e Merge pull request #2157 from Cameron653/TRASH_PILE_ADJ
Trash pile adjustments
2017-09-13 16:08:14 -04:00
killer653 794c1c2b67 Removes 2 useless items. Fixes indents on one. 2017-09-12 18:59:43 -04:00
Cyantime 6ee2ec7c81 Fixes mouse spawners 2017-09-12 18:14:15 -04:00
Cameron653 79c5018dfa Adds medical tape to paramedic and CMO locker 2017-09-12 14:54:06 -04:00
Anewbe 9a1d66ede2 Merge pull request #3795 from ghost/puddlefix
Fixes some descriptions.
2017-09-10 20:41:14 -04:00
Spades 4f7c6bb4ac Fixes #2138 2017-09-09 23:04:25 -04:00
Spades 8e3ada6721 Revert "Removes silly railing layering" 2017-09-09 22:44:12 -04:00
Spades 6eb472f31d Revert "Adds a new event - Solargrubs!" 2017-09-09 12:24:37 -04:00
Spades 6038c0a81f Merge pull request #2108 from Ketrai/master
Adds a new event - Solargrubs!
2017-09-09 12:24:26 -04:00
Belsima 960e535081 Fixes some descriptions. 2017-09-08 23:09:05 -04:00
Spades 8773cc389a Removes silly railing layering 2017-09-08 21:27:31 -04:00
Ketrai 03196646a9 adds solargrub to predator crate
coz whynot, we got carp in there
2017-09-05 16:15:03 +02:00
Neerti 8f00965cc2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 8/10/2017_make_xenobio_old_again
# Conflicts fixed:
#	code/modules/admin/topic.dm
#	code/modules/admin/verbs/debug.dm
#	code/modules/admin/view_variables/helpers.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	code/modules/mob/transform_procs.dm
#	maps/northern_star/polaris-1.dmm
#	polaris.dme
2017-09-05 00:58:27 -04:00
Neerti 4bfcec55f2 work 2017-09-04 21:52:47 -04:00
Anewbe 9ce3c85127 Merge pull request #3762 from Mechoid/Xeno_Tyranny_Electric_Boogaloo
Brings back the aliens (With hitches).
2017-09-04 18:32:25 -04:00
MagmaRam f2de8d5261 ha ha, disabilities are a hilarious joke am i right 2017-09-04 11:33:53 -05:00
Mechoid 5d390ca67b Brings back the aliens as they were when removed, minus huggers (until we can get a suitable replacement), for admins to use. 2017-09-03 01:46:08 -07:00
killer653 cafac8efae Polaris Sync 2017-08-28 20:52:11 -04:00
Spades 4eeabfc657 TRAVIS STOP 2017-08-27 02:23:39 -04:00
Spades 229431bd4d Oh sure you compile fine but Travis cries 2017-08-27 01:49:41 -04:00
MagmaRam e370d56656 Merge pull request #3710 from SpadesNeil/window-change
Weak attacks no longer can damage windows
2017-08-26 13:55:36 -06:00
Spades df37726669 Merge remote-tracking branch 'refs/remotes/origin/master' into oties-and-wild-removed 2017-08-26 15:51:47 -04:00
Spades 18ffeefafd Removies oties and outdoors area 2017-08-26 15:51:37 -04:00
Belsima 5268f21321 Adds more click sounds to the game. 2017-08-23 03:16:21 -04:00
Cyantime 007dc9c5d9 Reduces mice per pile from 2 to 1. 2017-08-20 21:42:00 -04:00
Cyantime 70a03f1155 No one saw that. 2017-08-16 19:20:57 -04:00
Cyantime 0df74e92fe Quik Fixes 2017-08-15 22:19:13 -04:00
Cyantime 499862bca6 Configurable mob spawners, re-implementation of trash mouse spawning. 2017-08-15 22:09:53 -04:00
Spades 8bbd131899 Better spot to do this in 2017-08-14 23:25:53 -04:00
Spades 60ead7642d Revert "Trash piles can now spawn mice" 2017-08-14 23:07:08 -04:00
Spades eaf2ec867d Actually let's make it 5. 2017-08-14 17:46:11 -04:00
Spades 2206b23305 If force is less than 10, an item can't damage windows. 2017-08-14 17:42:43 -04:00
Cyantime 8502ceaee6 Trash piles can spawn mice 2017-08-13 19:15:04 -04:00
Cyantime 9637c6a0eb TF refactor 2017-08-12 20:53:52 -04:00
PrismaticGynoid 1f1f537e1c Better Wheelchairs
Wheelchairs can now be collapsed by click-dragging them to you, much like rollerbeds. You can then pick them up. They are, however, too large to stuff into a backpack.
These new collapsible wheelchairs are now available in the loadout, under utility, for 4 points. They're also color-customizable now. No more plain white wheelchairs available only by missing feet.
The loadout wheelchairs will spawn with you buckled into them, just like how it works when you spawn without feet, except that the loadout wheelchairs can be more colors than just white.
2017-08-09 00:48:13 -07:00
killer653 d00de57f36 Merge remote-tracking branch 'refs/remotes/VOREStation/master' 2017-08-06 19:21:15 -04:00
killer653 468e73c7f3 Polaris sync 2017-08-06 19:07:17 -04:00
Cyantime c5594c31e5 alters trash pile loot pool 2017-08-06 04:18:26 -04:00
Neerti 4256ec902a Changes path of alien tools, adds hacking sounds, and makes the fireaxe cabinet use toolspeed. 2017-08-04 08:35:16 -04:00
Neerti 99eb6f9404 Updates Tools
Adds toolspeed var, which is a multiplier on how 'fast' the tool works.  0.5 means it goes twice as fast.
Adds usesound var, which determines what sound is used when a tool is being used.
Changes a lot of code to use those two vars instead.
Adds 'ayyy' tools, which are ported from /tg/'s abductor gamemode.  They're currently admin only but I might make them obtainable by xenoarch later.
Adds powertools, also from /tg/.  CE starts with them in a new toolbelt that spawns in their locker, ported from (you guessed it) /tg/.
Changes welder sprites to look nicer, ported yet again from /tg/.  Modified the blue welder slightly so it can be the electric welder sprite.
Adds various sounds from /tg/, for tools and welders.
2017-08-03 04:49:23 -04:00
Cyantime 68c053212c Disables phasing downward through catwalks 2017-08-02 22:29:42 -04:00
Cameron653 97e851f2e4 Adds in body snatcher device (#1822)
* Adds in body snatcher

* Modifies method the bodysnatcher works

* Fixes merge & compile error

* Update trash_pile.dm

* Update trash_pile.dm

* Gets transfer_to to work
2017-07-19 15:26:34 -04:00