Commit Graph

1674 Commits

Author SHA1 Message Date
Cameron Lennox
e650c62c6b LOTS OF FIXES 2017-10-08 18:05:27 -04:00
Cameron Lennox
15a6472d14 Pol Sync 2017-10-08 17:44:25 -04:00
Anewbe
ccd90031fa Merge pull request #4018 from MisterLayne/10/4/2017_DufflebagsSci
Science Dufflebag
2017-10-06 10:51:05 -05:00
MisterLayne
8aed98be14 Adds science dufflebag 2017-10-05 16:26:56 -04:00
Neerti
cf263e348e Merge pull request #3981 from Anewbe/gravetender
Adds the gravekeeper lost borg module
2017-10-03 23:01:15 -04:00
Spades
54d4069eff Merge pull request #2195 from Verkister/returnofthelongpup
Re-enables and fixes the CARGO EXCLUSIVE oties. Plus a couple new features! (Psst hey)
2017-10-03 22:31:24 -04:00
Spades
aa10a65b30 OSHA approved map changes
- More fire lockers and oxy closets in places.
- All elevator entrances have emergency shutters in front of them, which
can be used as a defacto airlock if needed.
- All fire closets have emergency toolboxes now.
- Other minor map edits.
2017-10-03 02:49:45 -04:00
Neopatra
2503183c21 Adds Taur hazmat and Rad suits to lockers
As well as bomb suits.
2017-10-01 09:30:32 -04:00
Anewbe
4dd9a4dbf2 Corrects the autospawn pod timer 2017-09-30 21:38:23 -05:00
Anewbe
d067f70403 Adds the thing that spawns the gravekeeper drone 2017-09-30 02:00:10 -05:00
Mechoid
77f0e7514c Combat exosuits can now actually punch through walls and girders again, based on their 'force'. Fixes some to_chat's. 2017-09-29 22:10:48 -07:00
Anewbe
7a13c8136f Finishing touches on gravemarkers 2017-09-27 18:59:26 -05:00
Anewbe
eed312a8fb Merge branch 'master' of https://github.com/PolarisSS13/Polaris into gravestone
# Conflicts:
#	icons/obj/structures.dmi
2017-09-27 13:49:56 -05:00
Anewbe
280f3010f8 Adds grave markers 2017-09-26 21:03:34 -05:00
Anewbe
670ae66772 Merge pull request #3956 from Neerti/9/26/2017_old_farmer_harrison
Adds Farm PoI
2017-09-26 19:12:35 -05:00
Neerti
aa454c0e1d Adds Farm PoI
Also fixes various bugs with surface tiles, hopefully.
Adds some documentation to the map file system.
Adds a new 'plane' map, ideal for testing PoIs by loading them manually.
Makes space heaters glow orange.
Adds a new grille type for fancy surface windows.
Adds self planting hydro trays/dirts if a seed is on top of them when the map is loaded.
2017-09-26 01:44:06 -04:00
Neerti
13685ec747 Merge pull request #3926 from Anewbe/to_chat_watercloset
Adds a few instances of to_chat()
2017-09-25 21:32:13 -04:00
Anewbe
a2bc262b05 Adds a few instances of to_chat() 2017-09-24 01:32:52 -05:00
Anewbe
4b2e4eeca7 Improves catwalks and railings 2017-09-23 20:43:51 -05:00
Verkister
bc5b5e7b44 Brings back some slightly tweaked individual oties.
-With the lack of any in-depth borkage documentation, I felt like staying with my earlier point of the big issues being likely caused by vast numbers of these feature heavy snowflake mobs being spawned for wilderness cannonfodder en masse, which the current wildernessless build would rule out for better troubleshooting.
-People had been missing these in IC near my chars in multiple occasions recently and I didn't have the heart to tell em they were gone lmao.
-Only available via cargo orders now.
2017-09-23 14:24:40 +03:00
Anewbe
c80b535a29 Merge pull request #3902 from Neerti/9/19/2017_lost_drone
Adds the Lost Drone
2017-09-22 15:24:05 -05:00
Neerti
afd7b15442 Adds the Lost Drone 2017-09-22 01:17:53 -04:00
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