Commit Graph

4091 Commits

Author SHA1 Message Date
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
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
Anewbe
331c688b71 Merge pull request #3816 from Neerti/9/11/2017_instability_tweaks
Tweaks instability
2017-09-12 18:19:52 -04:00
Anewbe
6ffebcef6e Merge pull request #3775 from Neerti/9/8/2017_tg_maploader_port
Port's TG's Maploader
2017-09-11 17:17:23 -04:00
Neerti
bb7be9b628 Tweaks instability
Instability should now feel more responsive and less sluggish to go away.  Instead of it being removed at a semi-random and slow rate, it now has a semi-defined half life of about 46 seconds (IE 100 instability will be around 50 in 46 seconds).  The radiate pulse now occurs every Life() tick as well, and by extension the light radius update, so you should be able to see your purple halo adjust faster.

This unfortunately necessitated tweaking to the strength of instability events.  Instability events should happen more often to compensate for it going away faster.  It may need to be tweaked further.

Instability Glow (IE radiating) now radiates the instability decayed in the Life() tick instead of a third of the current instability.  This means people have more time to get out of the purple light before they start glowing themselves.  Two glowing people tend to equalize their instability if adjacent for awhile, while a third person can cause runaway instability, as normal.

Glowing now starts at 10 instability instead of 30.

Technomancer cores show the instability delta in their stat panel.

Message for standing in purple made bigger and purple-er.

Fixes bug with certain spells which waited for the effect to go off before qdeling the hand item.

Fixes leftover Xenobio tests in example map defines.
2017-09-11 11:46:35 -04:00
Anewbe
97da00d8d5 Merge pull request #3791 from ghost/moonshine
Adds resources to the abandoned bar so you can make hooch or moonshine.
2017-09-10 20:40:36 -04:00
Anewbe
42e8bb6284 Merge pull request #3767 from Neerti/8/10/2017_make_xenobio_old_again
Make Xenobiology Old(ish) Again
2017-09-10 17:12:38 -04:00
Belsima
0958db769f Adds resources to the abandoned bar so you can make hooch or moonshine. 2017-09-08 18:50:20 -04:00
MisterLayne
a9ecddaaff Sleeper Console Quickfix 2017-09-08 17:42:58 -04:00
Neerti
1bc28c07c0 Port's TG's Maploader 2017-09-08 12:49:26 -04:00
Woodratt
07a503a05a SC Map Changes 972017
- Added files, cable ender and technically 'southern_cross-8.dmm'
- Adjustment of areas dm to give color to centcomm beach area icons
- Fixed SC centcomm dmm file, 'southern_cross-6.dmm'
- Overhaul of xenobio/xenoflora on 'southern_cross-3.dmm'
- addition of heavy duty cables to SC-3.dmm and SC-4.dmm
- Adjustments of southern cross files.
- Changelog?
2017-09-07 17:33:34 -07:00
Neerti
6964f398c8 Map edits and small tweaks. 2017-09-05 02:35:37 -04: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
Neerti
9d98406833 Makes Arrivals Shuttle Great
Arrivals shuttle now moves automatically to and from the station.  People still spawn onboard if they join the round with arrivals selected in preferences.
The shuttle is completely automated and will go to the station if someone boards it, and leave if nobody is onboard.
Changes some tape code so it can be mapped in.
Sadly the mapmerger is broken so the map file diff is massive.
2017-08-05 15:18:55 -04:00
Neerti
178dc07dfc Ports Shuttle Sounds + Fixes Southern Cross Shuttles
Southern Cross shuttles one and two can now launch.
Adds missing areas for shuttles 1 and 2.
Shuttles warming up, moving, or stopping now make a nice sound, ported from /tg/.
Rearranges shuttle datum/computer definitions to make it easier to read.
Removes cloaking abilities for most multi-shuttles.
Lowers transit time for multi-shuttles.  Can be raised later if desired.
2017-08-01 21:40:51 -04:00
MagmaRam
5dbf61ffb4 Merge pull request #3633 from Anewbe/ert_bullet_fixes
Corrects some sprite and mapping issues regarding bullets
2017-07-25 17:04:23 -05:00
Woodratt
1050b40b1c SC Map Changes
Station Zs now contained within the same dmm file

Number of overall dmm files reduced to 7 from 9

Adjustments to remaining SC files.

T-comms and Crew Monitoring Consoles should work across all station z levels.
2017-07-24 16:58:46 -07:00
Anewbe
88964443e7 Corrects some sprite and mapping issues regarding bullets 2017-07-23 20:09:56 -05:00
Anewbe
ab5e716624 Merge pull request #3617 from SpadesNeil/centcom-not-centcomm
CentCom not centcomm
2017-07-22 13:30:06 -05:00
Spades
7e4417d31f It's CentCOM not CentCOMM
I swear to god I have fixed this like three times already and somehow it
keeps coming back.
2017-07-21 04:29:39 -04:00
Spades
87979675fe Map change for prior commit. 2017-07-19 14:26:16 -04:00
Anewbe
649144b074 Swaps the security gun spawns for the right ones. 2017-07-08 16:13:40 -05:00
Anewbe
11e67f9a69 Assorted map tweaks 2017-07-08 16:06:12 -05:00
Woodratt
e75c3887b7 Woodrat breaks map stuff
Added SC map files for further work. Including hopefully all the related files.

New airlock sprite thanks to Virgo, with a alternate non-see through sprite.

Changes to the space and transit tiles (ported from bay).

Changes done to the NC map that should bring it more up to date with changes (shield defuse stuff and minor bug fixes)
2017-07-02 18:53:17 -07:00
Neerti
18012fa1d1 Port's Bay's Shuttle Cleanup
Shuttles now set themselves up upon being instantiated instead of relying on a monolithic proc in the shuttle controller.
Shuttles can now be defined more cleanly on a per-map basis, as well.
Accidentally fixes a broken admin shuttle.
2017-06-11 11:45:31 -04:00
Leshana
e48b548f2b More and more Destroy() cleanups all across the board - Return qdel hints. 2017-06-05 23:01:41 -04:00
Spades
bb2f19fe7d Map fixes, and a comment removal 2017-05-27 05:14:51 -04:00
Spades
3ff9d441f9 Finishes fixing ammo inconsistencies 2017-05-27 04:39:49 -04:00
Leshana
b4ca6b11e1 Switch nanomap computers over to using get_sensor_levels()
* Added a proc to the map datum which returns what zlevels a nanomap capable computer should display.
* Updated the atmos control, power monitoring, crew monitoring, and camera consoles to use it.
* Changed templates to not show the map button if no map levels are available.
2017-05-22 16:18:26 -04:00
Anewbe
5744812469 Merge pull request #3458 from VOREStation/vplk-mapz
EZ Map Datum Setup
2017-05-22 14:14:27 -05:00
Leshana
5594c9db39 An easier and more maintainable way of setting up the map datum.
* Settings for specific z-levels are defined in datum types, allowing the lists of Z levels to be automatically configured.  This solves the problem of being unable to use the z-level #defines in associative lists.
* Converted the example and northern star maps to use the new system.
2017-05-21 14:16:48 -04:00
Anewbe
58b9c63ec2 Makes the 556 and 762 calibers more appropriate to their naming 2017-05-01 20:25:43 -05:00
Anewbe
1fbef2de5b Merge pull request #3286 from VOREStation/smooth-lighting
Port tg/paradise/goon soft-edge lighting
2017-04-15 22:52:42 -05:00
Anewbe
91bec124b8 Merge pull request #3292 from Neerti/4/13/2017_shields
Changes Shields
2017-04-14 23:47:23 -05:00
Neerti
c84ab67fd3 Changes Shields
See PR for details
2017-04-13 00:36:13 -04:00
Leshana
e8af4afc88 Port tg/paradise/good soft-edge lighting
Ports https://github.com/ParadiseSS13/Paradise/pull/6161
Its merged in nearly verbatim as far as the lighting module goes.
Changes outside the lighting module are merged based on our codebase.
2017-04-12 19:11:45 -04:00
Anewbe
736659637f Gives the bartender a weapon permit in their spawned item list. 2017-04-09 14:22:15 -05:00
Neerti
20556a9d23 Modifies Main Map
Removes chirstmas tree in the garden.
Places statue back where they belong.
Removes all the xmas items I could find.
Changes pool water and garden water type to use new water tiles.
Makes the new codex spawn in several spots on the map, mostly in arrivals and the library.
2017-04-09 01:49:46 -04:00
Anewbe
e9c4b5a3eb Merge branch 'master' of https://github.com/PolarisSS13/Polaris into cosmetic_things
# Conflicts:
#	icons/mob/back.dmi
#	icons/mob/items/lefthand.dmi
#	icons/mob/items/righthand.dmi
2017-04-07 16:11:50 -05:00
Anewbe
6a95f6c87f Merge branch 'master' into apron_pockets 2017-04-04 17:54:38 -05:00
Atermonera
5f9b06566e Replaces a wall around the AI core with an RWall 2017-04-02 14:21:55 -07:00
Anewbe
8e9db2b7d4 Aprons now have pockets 2017-04-02 00:28:20 -05:00
Anewbe
ae3d790cd2 Fixes heels and the maps 2017-04-01 13:15:00 -05:00
Anewbe
7bb3f5fbb7 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into cosmetic_things
# Conflicts:
#	code/datums/supplypacks/medical.dm
#	code/game/objects/structures/crates_lockers/closets/wardrobe.dm
#	code/modules/clothing/shoes/miscellaneous.dm
#	code/modules/clothing/suits/labcoat.dm
#	icons/mob/back.dmi
#	icons/mob/feet.dmi
#	icons/mob/human_face.dmi
#	icons/mob/items/lefthand.dmi
#	icons/mob/items/righthand.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/shoes.dmi
#	icons/obj/clothing/suits.dmi
#	icons/obj/storage.dmi
#	maps/northern_star/polaris-2.dmm
#	maps/northern_star/polaris-5.dmm
2017-04-01 12:45:45 -05:00
Anewbe
b515f451d4 Maps in some jumper cables 2017-03-31 00:57:03 -05:00
Anewbe
05e0955e50 Fixes the elevator 2017-03-28 22:06:11 -05:00
Arokha Sieyes
77a73a898a Shuttle system tweaks
Fixes one line of code and touches up cryo shuttle look
2017-03-28 11:59:36 -04:00
Arokha Sieyes
d6c04b78e9 Dynamic Shuttles - Map Changes
Updates all the shuttle turfs.
2017-03-25 20:46:31 -04:00
Anewbe
38598f3aae Merge pull request #3118 from Neerti/3/6/2017_surface_map
Continues work on the surface map
2017-03-22 16:33:40 -05:00