uraniummeltdown
6d27ce0a62
added 10% chance for random crate to be added to supply shuttle on calling it to station
2017-03-18 11:19:31 +04:00
uraniummeltdown
d9dd77327a
increased time, wirecutter is now a welder
2017-03-14 18:21:21 +04:00
uraniummeltdown
dedc33a23f
decon time 15 -> 26
2017-03-12 17:57:30 +04:00
uraniummeltdown
85260a72ba
plastic is not a mineral anymore, plastic flaps are deconstructible, new construction.dm construction defines
2017-03-12 06:09:29 +04:00
davipatury
d4338bed12
Some changes!
2017-02-18 22:18:01 -02:00
davipatury
f1ae2e3f3a
Shuttle Console nano-ui.
2017-02-18 20:49:38 -02:00
Mark van Alphen
dea264faf2
Merge branch 'master' into stationgoals
2017-02-17 18:05:15 +01:00
Krausus
4754d6b4b3
Fixes some sounds not being cached properly
2017-02-17 02:37:26 -05:00
Fox McCloud
69eae328d3
Merge pull request #6386 from uraniummeltdown/nukedeclaration
...
Custom War Declaration
2017-02-13 06:12:31 -05:00
uraniummeltdown
4cb4b6be82
better war dec checks, added custom war declarations from TG
2017-02-12 20:30:17 +04:00
Markolie
4d857de148
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into stationgoals
...
# Conflicts:
# icons/effects/beam.dmi
2017-02-11 18:26:06 +01:00
Markolie
c93a592102
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_updates
...
# Conflicts:
# code/modules/shuttle/supply.dm
2017-02-10 18:19:53 +01:00
uraniummeltdown
60bb4fd5bc
ported quantum pads from TG and added to RnD
2017-02-09 00:33:07 +04:00
Markolie
3298f7edce
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_updates
...
# Conflicts:
# icons/obj/objects.dmi
2017-02-08 19:25:47 +01:00
Fox McCloud
b35eb8e96f
Merge pull request #6086 from tigercat2000/shuttle_hijack
...
Hijacking a shuttle diverts it to the syndicate outpost
2017-02-08 10:05:34 -05:00
Mark van Alphen
42cd3eec9a
Merge branch 'master' into stationgoals
2017-02-07 18:51:08 +01:00
Markolie
7b755d2511
Add warp cube to supply shuttle blacklist
2017-02-06 21:07:22 +01:00
Markolie
1d6754728b
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_updates
...
# Conflicts:
# icons/mob/head.dmi
# icons/mob/suit.dmi
# icons/obj/clothing/hats.dmi
# icons/obj/clothing/suits.dmi
2017-02-06 20:37:03 +01:00
Fox McCloud
800a54cc15
Merge pull request #6320 from Kyep/ert_shuttle_access
...
Fixes ERT and SST shuttle accesses
2017-02-06 10:08:33 -05:00
Markolie
b17dca7c57
Prevent signing own blood contract, prevent megafauna from healing on station, prevent hierophant teleports from going to Central Command
2017-02-05 20:36:04 +01:00
Markolie
f2497afd9d
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into stationgoals
...
# Conflicts:
# _maps/map_files/cyberiad/z2.dmm
# code/__DEFINES/is_helpers.dm
# code/__DEFINES/misc.dm
# code/_globalvars/lists/objects.dm
# code/modules/mob/living/living_defines.dm
# icons/effects/beam.dmi
2017-02-05 20:12:51 +01:00
Tigercat2000
5e8c14789b
Merge remote-tracking branch 'upstream/master' into shuttle_hijack2
2017-02-05 07:41:14 -08:00
Kyep
4e586e0db4
Fixes ERT and SST shuttle accesses
2017-02-02 17:47:21 -08:00
Fox-McCloud
6d4316264a
plant analyzer QoL
2017-01-29 03:37:22 -05:00
Fox-McCloud
fd63808e6c
supply shuttle re-addition
2017-01-28 12:56:20 -05:00
Markolie
a06c997629
Add Station Goals
...
Still to-do:
* Remove old BSA computer.
* Add NanoUI interfaces for all goals.
* Test it.
2017-01-23 22:02:29 +01:00
Fox-McCloud
7007f6bbdf
Merge remote-tracking branch 'upstream/master' into botany-rework
2017-01-23 01:01:09 -05:00
Fox-McCloud
10c0e734c3
more work
2017-01-22 01:46:48 -05:00
Crazy Lemon
2a209f62cd
Merge pull request #5814 from Markolie/ann2
...
Announcement refactor
2017-01-18 19:17:30 -08:00
Tigercat2000
22af92ad22
Hijacking a shuttle diverts it to the syndicate outpost.
...
tgstation/tgstation#22184
- Hijacking the shuttle will make it dock to a new dock on the
syndicate outpost.
- Fixed shuttle_master not calling mobile/dockRoundstart().
- Only Traitors, Changelings, Vampires, Nuclear Operatives, and
Syndicate Deathsquads can now hijack the shuttle.
2017-01-06 10:08:00 -08:00
Fox McCloud
d7bda7b415
Merge pull request #6051 from Crazylemon64/pai_ui_fix
...
Fixes pAI UIs
2017-01-06 03:08:27 -05:00
Krausus
ce7cc94136
Removes /obj/onShuttleMove invisibility check
...
The two invisible objects that shouldn't move now have their own
dedicated overrides
2017-01-01 13:10:46 -05:00
Krausus
b7aa0f8908
Now doesn't break shuttle previewing
2017-01-01 02:51:53 -05:00
Krausus
c79fa79900
Fixes landmarks not being moved by shuttles
2017-01-01 02:16:27 -05:00
Crazylemon64
f954382619
Adds a ui_key arg to ui_data
2016-12-31 12:51:07 -08:00
Markolie
1f243ec4f0
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ann2
...
# Conflicts:
# code/_globalvars/lists/objects.dm
2016-12-31 17:54:06 +01:00
Crazylemon64
3a64de1ffe
Manipulator has perms now
2016-12-29 17:22:47 -08:00
Crazy Lemon
ac597b7f8b
Merge pull request #5806 from Markolie/cameraconsoleupdate
...
Camera console update
2016-12-29 01:18:21 -08:00
Aurorablade
494040ea9d
i feel sorry for everyone subscriving to this PR
2016-12-24 00:42:58 -05:00
Aurorablade
e25ddf8329
Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into DWI
2016-12-24 00:18:40 -05:00
Markolie
e2587dbbbf
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ann2
...
# Conflicts:
# code/game/gamemodes/events.dm
# code/modules/awaymissions/bluespaceartillery.dm
2016-12-23 19:04:35 +01:00
Markolie
84c8b2e12b
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into cameraconsoleupdate
...
# Conflicts:
# code/game/machinery/computer/camera.dm
2016-12-23 18:58:58 +01:00
Aurorablade
c6c33803aa
fox box airlock
2016-12-14 20:11:02 -05:00
Tigercat2000
b9abce843d
NanoUI Update: Seperate UI Data into ui_data() proc
...
This commit changes how NanoUI's live data updating system works.
Previously, data for the template was directly gathered in the
ui_interact proc. Now, it is seperated into the proc `ui_data`.
To players, this does absolutely nothing.
To coders, this opens up the potential for a much more complicated and
fancy graphical updating system in the future, because the data is
available on-demand without ever having to call
nanomanager.try_update_ui.
2016-12-14 13:37:34 -08:00
Aurorablade
0bb62ebb36
everything works thanks to our tiger overlords..
2016-12-12 23:59:37 -05:00
Aurorablade
c5e6c9323b
addresses mrrowl comments
...
still haveing shuttle load issues after first one is loaded..
2016-12-11 23:11:21 -05:00
Aurorablade
2285f40a88
...okay soe ikea shuttles are back on new template loads
2016-12-09 22:23:12 -05:00
Aurorablade
a53a716bd2
....Well i fixed IKEA shuttles anyway....
...
now just to fix docking templates without force docking it.
2016-12-05 22:07:54 -05:00
Markolie
ffc74cda0a
Announcement fixes, change most command announcements to event announcements
2016-10-25 15:21:16 +02:00
Markolie
dc57019568
Better admin observer checking
2016-10-23 15:30:35 +02:00
