Commit Graph

89 Commits

Author SHA1 Message Date
ZomgPonies
277a900aa7 Merge pull request #1193 from Fox-McCloud/mobs-pets-stuffs
Simple Animal Refactor+Update+Fixes and Pet Collars
2015-05-28 22:45:03 -04:00
SamCroswell
6a508e2245 Fixes Scrubber Pipe
Also fixes an outstanding area tag issue that I missed.
2015-05-28 22:33:30 -04:00
ZomgPonies
15cfa99edc Adds chickenman and clown statues 2015-05-28 15:55:55 -04:00
SamCroswell
23b4c5b8e9 Chem Lab, Part 2 2015-05-28 15:13:39 -04:00
SamCroswell
2b5d5815e1 Chem Lab Re-map 2015-05-28 04:53:40 -04:00
Fox-McCloud
cd112b5364 Wolpin Fix+Monkey Tail Fix 2015-05-28 04:04:39 -04:00
Fox-McCloud
5d3e837b4a Mob Refactor+Update and Pet Collars 2015-05-28 00:20:25 -04:00
ZomgPonies
be68965578 Fix pun pun runtimes also fixes for datums not initializing before world 2015-05-26 20:15:53 -04:00
ZomgPonies
7c39634d1d Map fixes 2015-05-25 20:43:23 -04:00
Fox-McCloud
02bdc9612f Vulpkanin Update 2015-05-25 05:04:44 -04:00
ZomgPonies
0ecec2e1ec Merge pull request #1163 from tigercat2000/byetram
Remove tram from Research Hallway
2015-05-25 04:43:19 -04:00
Tigercat2000
0bf22f2b48 Remove tram from Research Hallway
MT/TS added one of it's trams to the research hallway, mostly as a
showcase, and the actual usefulness:annoyingness ratio was not taken into
account at all, mostly due to rose-tinted glasses after spending a long
time coding the modular connector system. Multiple people have pointed out
that it was poorly thought out, and as I look at it in the map editor, I
agree- it is a bit of an eyesore, serves no functional purpose, and breaks
whenever someone gets in it's way, which is common.

MT/TS will most likely return to the map some time in the future, when I
find a functionally useful place for it- Having it in research did
accomplish one of my goals of subjecting it to actual playtesting,
although not very much data has been gathered.
2015-05-24 20:33:22 -07:00
Tigercat2000
2218d8c0ab Fix some minor issues with pod doors and buttons 2015-05-24 20:25:13 -07:00
ZomgPonies
8ed29366c6 Merge pull request #1149 from IAmBigCoat/serverPipes
Server pipes
2015-05-23 10:06:01 -04:00
IAmBigCoat
d97b1cb657 Server room. Everything sorted out.
This took way too long and I hate everything.
Server room alarm functions.
Room is properly cold and air alarm isn't broke.
2015-05-23 05:35:23 -04:00
Fox-McCloud
fa051ff1ff Even more LINDA Fixes 2015-05-22 20:26:55 -04:00
Fox-McCloud
6884e593dd Merge pull request #1139 from tigercat2000/spacearea
Replace all instances of /area alone to /area/space
2015-05-22 18:42:08 -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
Tigercat2000
177db675d6 Replace all instances of /area alone to /area/space
This commit replaces every instance of /area(blank) with
/area/space(blank). The world default area has been replaced with
/area/space.
2015-05-22 11:22:38 -07:00
Krausus
d19e082a50 Fixes bad entries in the away mission map list 2015-05-22 08:12:30 -04:00
ZomgPonies
3e828465f2 Merge pull request #1114 from tigercat2000/massindrivein
/vg/ mass driver port
2015-05-21 08:40:58 -04:00
Tigercat2000
e470eee477 TMDU: Mass Driver Overhaul
This commit overhauls mass drivers.
Every component of mass drivers are now buildable.
This means:
 - Mass Drivers
 - Mass Driver Control Computers
 - Mass Driver Buttons
Mass driver control computers now support multiple mass drivers.
You can link mass-drivers to buttons via multitool.
Buttons have a range of 7 for their mass driver link.
Computers have infinite range.
2015-05-19 20:28:48 -07:00
Tigercat2000
c96631c6bd MT/TS: Added to map, fluffy cleanup, icon fix
This commit adds an MT/TS to the research department, changes the names
and descriptions of the tram parts to have a little more care, and
slightly fixes the rail icon.
2015-05-18 18:07:14 -07:00
ZomgPonies
c11264b11f Merge pull request #1091 from tigercat2000/TAPEEEEE
Duct Tape
2015-05-18 19:27:29 -04:00
FalseIncarnate
7ac9b2fd51 Wizard Den Map-fix
Unexplainable magic turned the wizard den's staves into energy guns
during the broom riding port. This has been corrected, making them
staves again.
2015-05-17 18:33:11 -04:00
Tigercat2000
a8702efd6b BAYPORT: Duct Tape
This commit ports Duct Tape from bay, alongside a few other changes for
our own code.

Bay12 Features:
 - You can tape paper to.. anything basically, like a sticky note.

Changes from Bay12:
 - Tape is a stack now, and has 10 uses per roll.
 - The guitar recipe now calls for 5 pieces of tape.
2015-05-17 14:11:25 -07:00
Tigercat2000
8897e71200 White ship podbay
The white ship podbay is now an actual podbay, instead of a mass-driver.
2015-05-16 11:31:59 -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
ZomgPonies
2023d19eca Merge pull request #1055 from tigercat2000/whiteshipactualship
Movable Telecomms White Ship
2015-05-15 19:38:06 -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
Tigercat2000
adef121fb1 MAPFIX: Pipe errors. Engineering, Virology. 2015-05-14 18:35:03 -07:00
Tigercat2000
21b1017178 Makes the white telecomm ship an actual movable shuttle 2015-05-14 14:55:22 -07:00
ZomgPonies
10db10584a Merge pull request #1038 from tigercat2000/corpor
MAP: Cyberiad, Corp jumpsuits, Engi curtains
2015-05-14 09:45:18 -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
MagicPussyCat
8e946a7a11 Welding Goggles for Sec Pod Pilot!
Put some welding goggles in sec pod pilot's pod bay so they can weld
their pod in peace and safety.
2015-05-13 08:48:16 -05:00
Tigercat2000
e1fad29990 Merge remote-tracking branch 'upstream/master' into SpaceCube
Conflicts:
	maps/cyberiad.dmm
2015-05-11 14:55:01 -07:00
Tigercat2000
d98bf2d958 Spacecube transitioning
This commit adds the spacecube system from -tg-. The spacecube system
allows for predicatably random space layouts- it is randomized every
round, but the transitions stay consistant for that round, therefore
making it possible to 'map' space, or explore in teams.
2015-05-11 12:43:10 -07:00
Tigercat2000
9dff485066 Update map system to -tg- standards
This commit updates the map system to -tg- standards. All stations are
defined under _maps/, and all .dmm files go under _maps/map_files/.

Currently, only the NCS Cyberiad is setup under the system.

Misc changes:
 - World Status contains the map name
 - dm.sh script will allow automatic map changing between restarts.
 - _globalvars folder starting to take shape, not everything is migrated
   there yet.
2015-05-11 11:09:18 -07:00