Commit Graph

351 Commits

Author SHA1 Message Date
Tigercat2000
288af9f92c Revert "Merge pull request #4739 from monster860/vg-parallax"
This reverts commit 451c934379, reversing
changes made to 64f26d999f.

Conflicts:
	SQL/paradise_schema.sql
	SQL/paradise_schema_prefixed.sql
2016-07-28 15:48:27 -07:00
monster860
b2cb87edc9 Merge branch 'master' into vg-parallax 2016-07-28 16:45:10 -04:00
monster860
94c1a4e08e Merge branch 'master' into vg-parallax 2016-07-08 14:51:30 -04: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
Crazylemon64
1745c71474 Fixes a bug involving a map template resetting the map loader's
progress
2016-07-06 22:51:48 -07:00
Crazylemon64
27ee3c7247 It's re-entrant now 2016-07-04 14:52:19 -07:00
Fox-McCloud
e754dca1f4 Nerfs Space Lube 2016-07-03 01:48:29 -04:00
Crazylemon64
0e50e4f27a Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_ruins 2016-07-02 15:37:58 -07:00
Tastyfish
4dd64607dd Makes Space Hotel Great Again (#4700) 2016-06-30 20:42:29 -04:00
Tastyfish
240376c4df Fixes beach edge overlay being pullable 2016-06-28 16:58:23 -04:00
Crazylemon64
0f438db4f6 Now with 100% less catastrophic atmospherics failure 2016-06-25 00:25:13 -07:00
Crazylemon64
a4fde648e7 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_ruins 2016-06-24 16:03:10 -07:00
monster860
120e470458 Ports /vg/ parallax 2016-06-21 14:58:49 -04:00
LittleBigKid2000
1a19b25c95 Removes dust from vox raider base (#4649)
* Is removes dusts from voxxy base

🆑 LittleBigKid2000
Fix: The vox raider's base is now filled with nitrogen instead of
regular dusty air.
/🆑

* Now with 100% less varediting to change air contents
2016-06-13 23:11:03 -04:00
Matt Milosevic
9f52a06829 Why do I forget stuff 2016-06-09 16:27:19 +02:00
Matt Milosevic
349d363f87 Please no more 2016-06-09 16:26:06 +02:00
Matt Milosevic
9ced03b85b Line notes 2016-06-09 13:46:15 +02:00
Matt Milosevic
bc86a86ece Hopefully final 2016-06-08 18:30:26 +02:00
Matt Milosevic
a162488f03 Totally refactors and updates the ruins code 2016-06-03 21:26:25 +02:00
Tastyfish
7efe0beb94 Fixes a few runtimes 2016-05-23 19:23:18 -04:00
Tastyfish
6b5aac8aee Fixes ignoreRest param, AStar 2016-05-08 23:47:51 -04:00
Tigercat2000
bee2954d7b Ports holomap blueprints from tg/vg.
Changes:
 - Clicking "view structural data" in the station blueprints menu will
   show you ghost images of where things like disposal pipes, wires,
   atmospherics pipes, and other power machinery are originally supposed
   to go. Note, this will show you the ghost images over turfs even if the
   machinery is destroyed.
2016-05-05 22:05:39 -07:00
Tastyfish
f51057b997 Fixes beach drop turf smoothing 2016-04-24 22:53:48 -04:00
Fox McCloud
ff27b4f77a Merge pull request #4263 from Tastyfish/smooth-shuttles
Fixes shuttle smoothing
2016-04-21 22:58:49 -04:00
Tastyfish
198656874d Fixes shuttle smoothing 2016-04-21 21:35:53 -04:00
Fox-McCloud
2954aa88ea abductor tech 2016-04-18 19:17:46 -04:00
Fox-McCloud
2453735d3f part 2 2016-04-17 00:21:31 -04:00
Fox-McCloud
f817351d2a part1 2016-04-16 10:40:21 -04:00
Tastyfish
a0ad6582a1 Updates maploader code to be in line with tg's, startup improvements 2016-04-10 02:57:58 -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
d1765e0e14 Merge pull request #4019 from tigercat2000/disease1
-tg- disease1
2016-03-30 21:29:58 -04:00
Crazylemon64
7aa519723b Merge branch 'master' of https://github.com/Crazylemon64/Paradise into metal_foam_space_flooring 2016-03-28 23:13:43 -07:00
Crazylemon64
00a39f5c83 Fixes stuff and stuff 2016-03-28 23:03:17 -07:00
Tigercat2000
ad2cf86898 -tg- disease1
Wee! Readds Disease1, kills off disease2, and finally removes poop.dmi
(fucking piece of shit)

Needs WAY more testing, most of which I don't know how to do yet, because
I've never used this system. Fun!

Changes:
 - Virus2 has been removed completely.
  - Some symptoms have not been readded. Aka, none of them have been
    readded, I just wanted to get this shit ported.
  - Virology has been updated slightly to mirror -tg-'s boxstation, as the
    virus2 machines are gone.
 - Welcome back, disease1
  - The centrifuge, vials, splicer, analyzer, growerthing, have all been
    replaced by the PanD.E.M.I.C. 2220
  - No symptoms have been completely removed; However, vision symptoms
    have been disabled pending byond 510, and genetics symptoms have been
    disabled until "when I figure out how to fix them".
  - Advanced Mutation Toxin now uses a disease, which turns people from
    species, to slime person, to slime. Slime people are instantly turned
    to a slime.
  - Diseased touch now give people appendicitis. Yes, they VANT YOUR...
    appendix.
  - Virology now has a fridge with the following in it:
    - Antiviral Syringes
    - 1 Rhinovirus culture
    - 1 Flu culture
    - 1 Bottle of Mutagen
    - 1 Bottle of Plasma
    - 1 Bottle of Synaptizine
  - A few more things, which I can't remember and can't look at while writing
    this commit. Sometimes, git hurts.

TODO:
 - Test more shit and figure out how the PanD.E.M.I.C. works/is supposed to
   work.
 - Fix genetics symptoms.
 - Give vampires a less shitty diseased touch.
 - Add appendicitis event.
 -
2016-03-27 21:24:00 -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
Crazylemon64
fa14522a1f Makes a different, more fragile, floor type for the metal foams 2016-03-18 20:12:27 -07:00
Tastyfish
ece677221f Made shallow->deep edge nicer 2016-03-14 02:56:37 -04:00
TheDZD
32cbcec7c1 Merge pull request #3784 from monster860/fixspacepodspacetransition
Fix space pod transitions
2016-03-08 19:36:03 -05:00
monster860
2f3a3633bd Made it faster 2016-03-08 10:55:14 -05:00
monster860
8ead04b960 Fix space pod transitions (#2230) 2016-03-07 16:23:40 -05:00
Tastyfish
d189d70f4a Adds tranquillite
Changes Recitence to be approx on par with Honker
Adds invisible wall barrier
2016-03-06 01:49:30 -05: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
cb2989eea1 Gave the beach an edge instead of endless void. 2016-02-27 03:03:23 -05:00
Fox McCloud
f2a26982cf Merge pull request #3708 from Tastyfish/zebra-plates
Fixes custom plating style issues
2016-02-26 03:19:46 -05:00
Tastyfish
236765ea9c Fixes custom plating designs 2016-02-25 21:25:11 -05:00
Tastyfish
35501c6dac Fixes crowbarring floors without floor_tile types 2016-02-25 19:35:24 -05:00
VampyrBytes
42f4f9b3d2 Fixes movement issues with opening and closing closets
Fixes #3687
Mobs no longer act as if they've moved when in a locker whilst it's
opened and closed.
The new proc does everything forceMove does except trigger /crossed on
/items and run the extra code in turfs\simulated\Entered (still makes
the parent call)
Also removed some now unneeded code from the /slip proc as this makes it
redundant
2016-02-24 21:23:38 +00:00