Commit Graph

292 Commits

Author SHA1 Message Date
Fox-McCloud
fc6514f5ba Merge remote-tracking branch 'upstream/master' into tg-weather 2016-07-16 11:07:43 -04:00
Fox McCloud
7c790a8b21 Merge pull request #4780 from Crazylemon64/space_ruins
Crazypilot's Space Ruins Port
2016-07-15 22:55:51 -04:00
Fox McCloud
aa2ff8ceea Merge pull request #4843 from FreeStylaLT/youpieceoffuckingshitforgottousemapmerger
Good heavens look at the time it's SEC REMAP O' CLOCK
2016-07-15 22:32:28 -04:00
Fox-McCloud
5216b39339 Ports TG's Weather System 2016-07-14 04:29:28 -04:00
Krausus
355fb3c080 Fixes morgue updating and removes VGhooks 2016-07-11 17:39:21 -04:00
FreeStylaLT
b9b70b3d82 re^6-mapped conference/locker rooms, added door to secondary armory, removed biohazard and bomb disposal lockers 2016-07-08 19:10:30 +03:00
Crazylemon64
a779fc8663 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_ruins
All hail glorious leader tigercat
2016-07-08 00:16:28 -07:00
Crazylemon64
20eee9064c Fixes init on various things, as well as allowing the
map loader to safely load templates mid-run
2016-07-07 23:52:44 -07:00
Tigercat2000
71e5344a98 Mass replace 2016-07-07 19:34:02 -07:00
FreeStylaLT
fad4528815 added new area icons for sec, changed processing and evidence room, various tweaks and fixes 2016-07-04 03:29:13 +03:00
Crazylemon64
0e50e4f27a Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_ruins 2016-07-02 15:37:58 -07:00
FreeStylaLT
fb12e713a7 LETS ALL TAKE A MOMENT TO REMEMBER TO USE MAPMERGER. ESPECIALLY ME. PLEASE. FOR THE SAKE OF ALL THAT IS HOLY PLEASE. 2016-07-02 18:26:20 +03:00
Norgad
7e06d5a590 Extends Incinerator Maintenance - 'No gross commits everywhere' Edition (#4774)
* Moved everything over

its fine

* does that

it does

* fixed doors

ssssssssssssssssss
2016-06-28 15:49:31 -04:00
Crazylemon64
c0f5cedf41 Adds a system to give each ruin a separate area
- This means separate APCs and air alarms, while still sharing the same
"Space" area, or any other area that isn't a ruin subtype
2016-06-25 01:44:08 -07:00
Krausus
eecf8ba93b to_chat fixes
Mostly sounds using to_chat instead of << like they should. Also, the
to_chat CRASH now refers to itself as to_chat instead of Boutput.
2016-06-24 18:36:50 -04:00
tigercat2000
c7bdb89454 Fix SST shuttle, make it a real shuttle (#4675) 2016-06-15 04:48:26 -04:00
monster860
42639bcab5 Traders Event (#4016)
* Traders Event

* lien notes

* Fixes indent

* Gets rid of things Fox doesn't like.

* how did that get deleted

* Get rid of things maintainers don't like

* Adds some crates to the shuttle, and a recall console to the base.

* EVENT_LEVEL_MAJOR, and make it weight 0 (out of rotation)

* line nutes
2016-06-11 12:47:20 -04:00
Tastyfish
6b5aac8aee Fixes ignoreRest param, AStar 2016-05-08 23:47:51 -04:00
Fox-McCloud
2453735d3f part 2 2016-04-17 00:21:31 -04:00
Tigercat2000
78f53553f8 Reduce lines by removing blank lines added by PJ's script 2016-04-05 08:25:57 -07:00
Tigercat2000
9d430844c3 Replace most (if not all) output << operators with to_chat(user, message)
Currently, to_chat is literally just a proc that does user << message.
But it'll let us do output modification in the future, especially for
something like Goon's HTML chat.

Big thanks to PJB for his to_chat script, see
https://github.com/d3athrow/vgstation13/pull/6625 for more details.
2016-04-05 08:15:05 -07:00
Fox-McCloud
9127c357e9 further thingssssssssssssssssssssssss 2016-03-30 18:17:55 -04:00
Fox-McCloud
6648175a63 Ports Advanced Cameras 2016-03-29 06:05:59 -04:00
Tigercat2000
bb5057a697 This means that the nukeops can teleport to the wizard base on their assault pod, but better than stranding wizards I guess 2016-03-19 15:09:29 -07:00
Tigercat2000
9854f48ca9 Assault Pods & Fixes
Fixes:
 - Lighting system bandaid: Lighting overlays can't go below 0 lum ever
 - -tg- shuttles now use changeTurf() and forceMove() appropriately
 - forceMove() actually bothers to update lighting now
 - Fixed teleportlocs including prohibited areas. Sorry wizards, no more
   area teleporting to Central Command.

Misc changes:
 - Moved the emergency shuttle stuff to the modules/shuttles/ folder
 - Moved the cargo shuttle stuff to the modules/shuttles/ folder

Features:
 - Added nukeops assault-pod. Nuke ops may purchase a destination setter
   for 30 telecrystals.
   The assault pod is a shuttle, equipped with 8 turrets that use
   weakbullet3. When an area is selected, a destination will be randomly
   placed in one of the turfs in that area. The pod will gib anyone
   standing in the area where it lands, and overwrite any turfs.
2016-03-19 14:45:45 -07:00
FalseIncarnate
374c2db600 Beach Expansion Update
Expands the beach away mission to include a brand new scuba-diving area!
- Somewhat empty, but has a few points of interest scattered about and
can be added to in the future

Visually updates the beach
- Sand texture changed, and given randomization for a more varied
beachfront.
- The row of crates and lockers has been replaced with 3 changing
rooms/tents so you can change into that mankini in private.
- Changes the water texture to be less bland
- Expands the water area to give more room for swimmers to play in
before they reach the edge

Adds in the Diving Point Buoy and Diving Point Anchor objects, used to
transition between the beach surface and the underwater area
- Hit with an empty hand to transition between the two points

The underwater area has a few "minor" dangers to prepare for:
- Sea Carp
- These carp (unlike their space-faring cousins) won't attack on sight,
and will try to swim away when attacked. They still bite if they work up
the courage to come back.
- Water
- Water and lungs don't work well together, who knew!? Skrell, Neara,
and anyone who has NO_BREATHE can happily explore, while the rest will
want to pack some internals lest they begin to drown.
- Drowning in the scuba area doesn't require you to be lying down,
unlike the pool. You're in over your head (literally).
- Darkness
- Not quite a danger in itself, but it's easy to get disoriented in the
dark water, and that can be frustrating.

CODE STUFF
- Broke up the pool controller code into a couple procs for cleanliness
and in case we want to have a type of pool controller that doesn't drown
or doesn't adjust bodytemp
- Made ladders use forceMove instead of directly setting loc
- Removed an entirely unused area (/area/beach)

Crappy coder-sprites for Buoy and Anchor done by myself.
- Ok, they actually aren't THAT bad, but they aren't fantastic.
2016-03-01 21:02:15 -05:00
Tastyfish
aed9859b9a Fixes a bunch of things to not circumvent SetStun/SetWeaken/SetParalyse that has no business doing so. 2016-02-28 01:11:36 -05:00
Glorken
5e2591aa71 Adds Knight Arena to Holodeck
Creates a holodeck option akin to the thunderdome, but with knight armor
and claymores. Also adds blue and red claymore sprites.
2016-01-30 17:26:52 -05:00
Tastyfish
38651c3362 Made Starboard Emergency Storage -> Genetics Maintenance 2016-01-15 00:53:19 -05:00
Tigercat2000
7474cbcf48 Shuttles: Admin, Ferry, ERT + Science Fix 2015-12-17 14:21:42 -08:00
Tigercat2000
527475f886 Shuttles: NukeOps, Fixes 2015-12-17 11:41:55 -08:00
Tigercat2000
e82eff800c Shuttles: Research + Mining fixes 2015-12-15 18:19:34 -08:00
Tigercat2000
544908c778 Shuttles: Vox Skipjack + Win button 2015-12-13 13:13:39 -08:00
Tigercat2000
0fa321a6f9 Misc. Fixes, shuttle_caller_list, autoCall 2015-12-12 07:33:10 -08:00
Tigercat2000
5f83a61188 Shuttles: Labor + Fixes 2015-12-11 13:23:04 -08:00
Tigercat2000
ebcc4edcef Shuttles: P2, Escape Pods n' Fixes 2015-12-07 14:27:37 -08:00
Tigercat2000
c3f476f62c Supply shuttle, initial_move() fixes, dock fixes
Supply has been almost completely replaced by -tg-'s system.

No fancy UI, unfortunately, but modifying bay's directly was not possible.
2015-12-04 21:48:40 -08:00
Tigercat2000
e60799474b tgshuttles unfinished 2015-12-03 10:59:06 -08:00
Fox-McCloud
8774ec1f66 Lights and Static Power: Machine Processing Optimization 2015-10-18 21:06:25 -04:00
Fox-McCloud
1bcceb0b26 viro and sci maintenance 2015-09-25 02:07:49 -04:00
Fox-McCloud
d41b09c0a6 Experimentor Addition--Telesci Removal 2015-09-17 00:59:38 -04:00
Markolie
59b78376e9 Display case update, some forceMove updates 2015-09-14 20:21:56 +02:00
Tigercat2000
a54be7c47b Centcomm Mods
Moved the kitchen and dorms to be sticking out less
Added escape bathrooms
2015-08-27 12:59:37 -07:00
Markolie
74360297c4 Use hooks anyway 2015-08-18 00:57:49 +02:00
Markolie
4e8bb6d301 Admin teleport update, further admin message fixes 2015-08-18 00:54:25 +02:00
TheDZD
56af11019a Merge pull request #1708 from Markolie/caching
Caching
2015-08-11 17:42:57 -04:00
Markolie
7101ccde02 Further caching updates 2015-08-11 18:28:45 +02:00
Markolie
62c4c04e2f Gives Telecomms a functional solar system 2015-08-10 04:08:26 +02:00
Markolie
89665cfe5c Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into alarms
Conflicts:
	_maps/map_files/RandomZLevels/moonoutpost19.dmm
	_maps/map_files/cyberiad/cyberiad.dmm
	code/controllers/master_controller.dm
	code/game/machinery/alarm.dm
	code/modules/power/apc.dm
2015-08-03 00:04:24 +02:00
Markolie
5f95452f55 Air alarm LINDA support 2015-08-02 22:25:11 +02:00