Commit Graph

692 Commits

Author SHA1 Message Date
ZomgPonies
fd2dce684f Merge pull request #1159 from tigercat2000/MetaStationPort
MetaStation V41A II port
2015-06-05 17:49:13 -04:00
Tigercat2000
74f304e88c Metastation: Compatibility modifications
This commit modifies metastation to actually be playable on our code
Squashed Commits:
 - [META] Fixes emergency shuttle being stuck
 - Toxins Mixing fix: chamber floor > engine
 - Adds research outpost + Chem lab to routpost
 - Add vox raider ship, fix pods and a few shuttle zones.
 - Remove step_x so TRAVIS likes it
 - Finish spawn points, add telepad.

 - Replace showroom with NT-rep/Blueshield Office
   Don't worry, the nuke keg is in the meeting room.
 - Convert art storage to barber shop, place artvend in tool storage
 - Buncha medbay tweaks, 2nd surgery table, body scanners, fixed sleepers,
   minor balance changes.
 - Add Mr. Changs to dorms
 - Update meta to latest paracode
 - Fix punpun
 - Atmos volume pumps, atmos control console
 - Add chicken statue to Mr. Chang's (*cry), Bar smartfridge
 - Fix mr. changs statue and chairs
 - Add togglable polarized windows to surgery, so surgeons can prevent seeing
   other surgery procedures if necessary
 - Actually add atmos control comp
 - Hydro trays are no longer dirt
 - Fix brig windoors
 - Fix escape shuttle sleepers
2015-06-04 19:28:45 -07:00
Fox-McCloud
4eadd086d0 Fixes Wardrobes an Item Spawning 2015-06-04 20:13:18 -04:00
Fox-McCloud
296093951b defib failed 2015-06-03 02:24:02 -04:00
Fox-McCloud
c5f16b538a oops 2015-06-03 00:27:38 -04:00
Fox-McCloud
41512b0252 Exam Room Tweaks 2015-06-02 23:17:17 -04:00
ZomgPonies
97fadbede5 Merge pull request #1237 from Fox-McCloud/barsigns
Refactors Barsigns
2015-06-01 19:42:41 -04:00
Fox-McCloud
866de52f0f SNIP 2015-05-31 22:32:20 -04:00
Fox-McCloud
bbed6a2a42 Refactors Barsigns 2015-05-31 20:04:12 -04:00
Fox-McCloud
e098364432 Stun+Weaken Balancing 2015-05-31 06:35:14 -04:00
Tigercat2000
cced767094 Port Atlas's implementation of -tg-'s canvas art. 2015-05-29 15:43:42 -07:00
Fox-McCloud
5d3e837b4a Mob Refactor+Update and Pet Collars 2015-05-28 00:20:25 -04:00
Fox-McCloud
f87c819d25 heheh 2015-05-27 20:02:22 -04:00
Fox-McCloud
127aff20ba Fixes Rubber Duck 2015-05-27 19:55:35 -04:00
FalseIncarnate
a1cce51559 Merge Conflict Fix, Attempt 2 2015-05-27 01:07:19 -04:00
FalseIncarnate
c385cb7f4f Botany Belt, Biogenerator Additions
Adds in the new Botany Belt, a belt designed for handling all sorts of
botany-related tools.

Adds the Botany Belt, Security Belt, Medical Belt, Janitor Belt, and
Bandolier to the Biogenerator's list of products.

Re-arranges the biogenerator's product listing to have a new "Belts"
section, dedicated to (you guessed it) belts.
- Moves the Utility (tool) into the Belts section, previously was in the
Leather section
- The new belt listings are also in this section.

All belts in the biogenerator have the same base cost of 300 points.
Increasing the efficiency of the machine will lower the costs
appropriately.

Adjusts some code related to the security belt so they won't magically
have a seclite in them when created via biogenerator.
- The belts in the sec lockers will still have their light
- The ERT belt no longer needs to clear contents during its New() proc
to remove the seclite.
2015-05-26 13:54:24 -04:00
ZomgPonies
264369bdfa issmall fixes and order of operations 2015-05-25 23:50:53 -04:00
ZomgPonies
e056abfb82 3/3 port done 2015-05-25 20:16:34 -04:00
ZomgPonies
1935a82afe 2/3 of port done 2015-05-25 19:48:13 -04:00
ZomgPonies
f2d03e93c2 First 1/3 of port done. 2015-05-25 17:59:30 -04:00
Fox-McCloud
5b26b1ca59 Janitor--Bar of Soap 2015-05-23 20:50:12 -04:00
ZomgPonies
c8f9aa0c33 Merge pull request #1140 from Fox-McCloud/tweaking-stuff
Tweaks and Fixes 2.0
2015-05-22 17:24:29 -04:00
Fox-McCloud
1c1eec3210 Tweaks and Fixes 2.0 2015-05-22 16:29:12 -04:00
Fox-McCloud
0da9c966f0 More Linda Fixes 2015-05-21 19:33:54 -04:00
Tigercat2000
2d49015d4f Port -tg-'s port of /vg/'s smoothwall.
This commit ports -tg-'s port of the /vg/ smoothwall system. An important
thing to note is that we have extra code on top of the -tg- port to make
it work at all, and therefore, it may not be as efficent.
2015-05-17 07:39:53 -07:00
ZomgPonies
6bfd92b16a Merge pull request #1061 from FalseIncarnate/wizard
Brooms, Stick-horses, and Flying Wizards!
2015-05-16 07:34:22 -04:00
Fox-McCloud
8a5e3663df Fixes and Tweaks 2015-05-15 21:58:24 -04:00
FalseIncarnate
55087890de Brooms, Stick-horses, and Flying Wizards!
A port of https://github.com/d3athrow/vgstation13/pull/4377

![image](http://i.gyazo.com/dd415093be904dc9e5d40570598eddb9.gif)

Allows brooms to be wielded with 2-hands. Doing so places the broom
between your legs so you look like you are riding it.

You can also put a horsehead mask onto the broom to create a stick-horse
to ride. This can also be wielded, but will ALWAYS appear between your
legs.

And for the more magically inclined, wielding a broom or stick-horse (2
hands!) will cause you to ride it like a witch, giving you the ability
to bypass hazards such as tables and banana peels.
2015-05-15 03:52:36 -04:00
Krausus
f5f15881c2 Fixes luminosity checks
They should now be more in-line with how they worked under the old
lighting system.
2015-05-15 01:07:08 -04:00
Tigercat2000
0a991322c3 MAP: Cyberiad, Corp jumpsuits, Engi curtains
This commit does the following:
 - Adds a corporate wardrobe to security, equipped with 3
   corporate jumpsuits and 3 corporate caps.
 - Changes the shower curtain on the engineering outpost from a regular
   curtain to an engineering curtain, because we have those now
2015-05-13 07:22:25 -07:00
ZomgPonies
1b9cd2dfe4 Merge pull request #999 from Fox-McCloud/hiding
Potted Plant Hiding
2015-05-11 17:06:40 -04:00
ZomgPonies
f22ae3acbe Merge pull request #998 from tigercat2000/LightShit
Baystation12's Lighting Overhaul
2015-05-11 17:06:30 -04:00
Tigercat2000
40bd004923 Merge remote-tracking branch 'upstream/master' into WeaponCleanup
Conflicts:
	code/defines/obj/weapon.dm
	code/modules/hydroponics/trays/tray_tools.dm
2015-05-10 14:15:51 -07:00
Tigercat2000
625dbb5295 Merge remote-tracking branch 'upstream/master' into LightShit
Conflicts:
	code/modules/hydroponics/trays/tray.dm
	code/modules/hydroponics/vines.dm
2015-05-10 13:56:28 -07:00
Tigercat2000
e1249fc640 Lighting overhaul.
This commit overhauls the lighting system to Bay12 standards. It is better
in pretty much every way.
2015-05-10 12:03:27 -07:00
Fox-McCloud
428dde8047 Potted Plant Hiding 2015-05-10 14:41:06 -04:00
Tigercat2000
27442f9539 Water_act: Wetlevel for carbon mobs
All carbon mobs have a new variable called wetness, which is increased
upon water_act's that have a volume over 10, and is decreased every 22~
cycles of mob_master.

This variable currently does absolutely nothing but change their examine
text.
2015-05-10 05:39:26 -07:00
Tigercat2000
595f24bd1b Cleanup /defines/ folder.
This commit removes code/defines/obj.dm and code/defines/obj/weapon.dm.
These files were only kept for legacy compatibility and do not fit into
the tree system at all. It doesn't even make sense since the base defines
are all that were in these, the actual code for the items was in the right
file.

Any new ports that use this file on a different codebase should be sorted
into the tree system anyways, new files if necessary. A giant defines
file is just wasting space and searching effort.
2015-05-09 16:06:59 -07:00
Tigercat2000
e33e658178 Water_act system - for all your watery needs
This is the first commit of the Water_act system for monkey cubes,
showers, and mobs. The idea of the system is to outsource the effects of
water to the object/mob being affected instead of a bunch of snowflake
code.
2015-05-09 05:43:47 -07:00
FreeStylaLT
c290b1471e Engineering berets changes
Adds in a REAL Engineering beret, renames the current one to "atmospherics
beret", they spawn in engineering and CE's lockers.
2015-05-03 01:41:42 +03:00
Tigercat2000
26f1cd88d5 ONE DAY I WILL HAVE FIXED TOXINS MIXING
I left out a very important define from plasma windows that prevents them
from heating the room
2015-05-01 07:52:29 -07:00
TheDZD
92a7c44bad Merge pull request #902 from Fox-McCloud/rings
Adds in Rings
2015-04-30 19:22:58 -04:00
Tigercat2000
4e4285dccf Fix plasma windows breaking due to temperature
So uh, I forgot to define fire_act AND temperature_act as returns for the
plasma windows, so the toxins chamber kept breaking open. Whoopsies.
2015-04-30 13:49:32 -07:00
Tigercat2000
dfc74ebde6 Modify fire_act to temperature_expose where needed
This commit changes a bunch of objects fire_act's to temperature_expose,
to allow for superhot gas to act like an actual hotspot. This behaviour is
consistant with -tg-.
2015-04-29 16:56:12 -07:00
Fox-McCloud
1b0ea1e226 Adds in Rings 2015-04-29 19:05:43 -04:00
Tigercat2000
62657448d4 Reintegrate mob fire
I took out the entire on_fire system to work on LINDA. This commit readds
it.
2015-04-28 13:57:58 -07:00
Tigercat2000
9b7b4ae656 Apply most/all of LINDA's updates
This commit ports most, if not all of LINDA's updates on -tg-, and fixes a
few bugs that appear to be unique to paradise's codebase.
2015-04-28 12:45:58 -07:00
Tigercat2000
4f1053f5b7 LINDA, Stage 1
This commit ports the base system of LINDA from TG. This version of linda
is the original version, with none of -tg-'s fixes, rewrites, or other
such improvements attached.

The mob ignite system has been 100% removed, as LINDA does not support
this normally. It may be added back in when the improvements and refactors
to LINDA have been ported.
2015-04-28 08:43:42 -07:00
Fox-McCloud
4025495782 Merge remote-tracking branch 'upstream/master' into sofa 2015-04-26 15:10:09 -04:00
Fox-McCloud
55ba0ab60e Better Sofa 2015-04-26 03:43:56 -04:00