Commit Graph

14 Commits

Author SHA1 Message Date
unid15
8b910fb72b ROTATING SHUTTLES 0.1 2015-08-20 16:29:43 +02:00
D3athrow
d59f6a07b0 comment out panicwriter and saytesting 2015-07-20 16:04:48 -05:00
D3athrow
41d7df01fd just fuck my shit up 2015-07-18 02:30:51 -05:00
D3athrow
01d2471fc9 Merge branch 'color_replace_2_electric_boogaloo' into Bleeding-Edge
Conflicts:
	code/ATMOSPHERICS/pipe/pipe_dispenser.dm
	code/game/machinery/computer/HolodeckControl.dm
	code/game/machinery/embedded_controller/embedded_controller_base.dm
	code/modules/mining/money_bag.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/silicon/mommi/mommi.dm
	code/modules/mob/living/simple_animal/friendly/farm_animals.dm
	code/modules/research/destructive_analyzer.dm
	code/modules/research/rdconsole.dm
	code/modules/research/xenoarchaeology/machinery/analysis_base.dm
	code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm
	code/modules/research/xenoarchaeology/tools/ano_device_battery.dm
2015-04-12 16:40:59 -05:00
petethegoat@gmail.com
f363948dc6 Committing some of SuperSayu's misc patches: http://forums.nanotrasen.com/viewtopic.php?f=16&t=11671
* Smart fridge smartly shows (x5)(x10)(x25)(All) vend options based on quantity stored
* Gateway fix: When the away mission gate is calibrated, you will come out facing south. Matters somewhat when walking through in an exosuit. Also one pedantic text edit.
* Drink volume estimation:
* * Moved "half-full" to 26%-66% rather than 25%-49%
* * Moved "almost full" to 67%-90% rather than 50%-111% (1/.9)

Also removed /obj/item/weapon/directions and /obj/item/weapon/paperscrap.
They've been replaced by /obj/item/weapon/paper/crumpled and /obj/item/weapon/paper/crumpled/bloody.
Updated 2.1.0 and all away missions.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5497 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-08 20:58:31 +00:00
Kortgstation@gmail.com
f2c1898b6a Added Exile Implants.
Someone implanted with an Exile Implant will be able to enter the away mission, but unable to return from it. Not only can they be used for getting rid of dangerous criminals, but revs/stationheads count as dead while on the away mission, and traitor/changeling/wizard assassination targets count as dead if they're on the away mission at round end, allowing for those objectives to be completed peacefully.

Added a locker of exile implants to the gateway room.

Added a health analyzer to virology.

Replaced the teleport scroll in station collision with a cultist space suit/helmet. This is both because a teleport scroll is sorta overpowered in general and because it would allow people to easily return from exile.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5133 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-20 14:34:29 +00:00
Kortgstation@gmail.com
2bf072ba28 You can now throw objects and mobs through the gateway.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5130 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-20 07:38:54 +00:00
petethegoat@gmail.com
3847c3d638 Photocopiers work properly with photos once again.
Updated gateways a bit, they use a few less globals now.

Added some new snow icons.
Added a wip away mission.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5122 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-19 16:28:52 +00:00
Kortgstation@gmail.com
a22846684c Added a config option for assistants having maint access. Default is them not having it.
Added a config option for the delay on the gateway opening. Default is still half an hour.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5058 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-13 23:36:23 +00:00
Kortgstation@gmail.com
dae813ec40 Removed the old gateway structure placeholders.
Made the gateway check for another gate before checking for whether it is charged. This is too stop poor confused players standing at the gate waiting for it to locate an away mission when one isn't loaded.

Ticked stationcollision.dm so it is actually possible to play Nodraks map without specifically compiling your server to do so.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4870 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-14 02:04:10 +00:00
Kortgstation@gmail.com
84308d4042 Split the gateway/center into two objects, stationcenter and stationaway. The gates actually search for and detect eachother, and warp to eachother (suck it Pete)
The away gate doesn't require power to make away mission mapping possible in unpowered areas like caves, the station gate requires less power than it did (for the time being, it'd be nice if people could actually use the gate. Makes no sense to make new content so hard to use. If it becomes a problem, I can up the power requirement again).

Added a "calibrated" var to the away gate. If it's uncalibrated, you'll warp to the destination landmarks. Hitting the gate with a multitool with calibrate it, and any more warping to the gate will be on target.

It defaults to calibrated, so remember to set it to 0 if you want people to appear somehwere other than at the gate.

Updated Cheridans map with the new gate type (and made it uncalibrated)

Updated the example map to use the new gate type

Updated the station to use the new gate type

Changed the gateway description to reflect it's unknown origin

To do: Make gates able to block sending from the other gate (so you can exile people), make damaging gates so they can't send/recieve (and still do the other) possible. Give the station gateway unique sprites (for Nanotrasens own prototype gate, with appropriate description)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4718 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-18 05:59:36 +00:00
petethegoat@gmail.com
db18a91568 Updoot for away missions. Nothing big.
Also added brown bear sprites.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4668 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-09 19:06:38 +00:00
petethegoat@gmail.com
3f7985844e More work on away missions. They're almost playable now.
Things left to do mainly involves stuff interacting with Z8 - counting people as dead, making sure teleports don't work, etc.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4661 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-08 23:50:54 +00:00
petethegoat@gmail.com
08f350acda Committing work on away missions.
Standardised cigs_lighters.dm a bit.

Removed the SORD, and some unused and shit flasks.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4609 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-02 23:58:11 +00:00