Poojawa
1a2460ed28
Continous update intergration until being merged
...
Also tgui fixes/updates
2018-09-15 00:37:29 -05:00
Poojawa
284e9d0325
module things, jfc
2018-09-11 07:51:01 -05:00
deathride58
f1739cb482
Upstream fix mirror spree ( #7362 )
...
* tgstation/tgstation#39025 - Fixes nukeop eshield not being buyable
* tgstation/tgstation#39011 - [s] Adds missing logging to the staff of storms
* tgstation/tgstation#38980 - Corrects a stat error in the Nuke Ops uplink
* tgstation/tgstation#38988 - Fixes blob victory.
* tgstation/tgstation#38990 - Allow players to un-ignore previously ignored popups for ghostroles, and ignore notifications with no ignore button
needs tgui recompile
* tgstation/tgstation#38994 - Fix timer bug
* TGUI recompile
* tgstation/tgstation#39035 - Fixes navigation computers.
* tgstation/tgstation#39043 - Fixes minor genetics scanner runtime
* tgstation/tgstation#39044 - Fixes burgers icons
* tgstation/tgstation#39055 - Fixes porta_turret and decal shuttle rotations
* tgstation/tgstation#39063 - Stops extinguishers from cooling turfs to absolute zero
* tgstation/tgstation#38967 - Fixes smuggler's satchel init typo
* tgstation/tgstation#38931 - Fixes pulse rifles exploding structures in nullspace and that sort of thing
2018-07-20 03:40:39 -07:00
deathride58
3e18d8208e
Updates to tgstation commit 78e471d
2018-07-05 01:22:27 -04:00
CitadelStationBot
71b3349c2d
[MIRROR] Custom dockers must be greater than 10 tiles from map edge ( #5922 )
...
* Custom dockers must be greater than 10 tiles from map edge (#36306 )
* Custom dockers must be greater than 10 tiles from map edge
2018-03-12 07:30:29 -05:00
deathride58
6d91d7d438
fixes bad mirror
2018-03-09 15:58:25 -05:00
deathride58
28e6c899b2
Update navigation_computer.dm
2018-03-09 14:39:51 -05:00
vuonojenmustaturska
f8d783ae70
Disables advanced shuttle navigation consoles during nuclear war ops
2018-03-09 12:49:44 -06:00
CitadelStationBot
b7015c379a
[MIRROR] Cleans up some time stuff with DisplayTimeText ( #5685 )
...
* Cleans up some time stuff with DisplayTimeText
* Update hot_potato.dm
2018-02-24 07:02:45 -06:00
deathride58
aabbbb9dff
aaaand the rest of the modules folder
2018-01-04 01:45:38 -05:00
LetterJay
518b264654
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33783
...
# Conflicts:
# _maps/map_files/generic/CentCom.dmm
# code/modules/mob/living/living.dm
2017-12-29 01:34:17 -06:00
deathride58
aa83dbf500
Merge pull request #4532 from Citadel-Station-13/upstream-merge-33759
...
[MIRROR] Modified the starting locations of advanced camera console eyes
2017-12-28 02:54:18 +00:00
Cruix
b0facbda47
Fixed shuttle docking computers not working more than once ( #33782 )
...
* Fixed shuttle docking computers not moving the docking port if it already existed
* Removed explicit type instantiation
2017-12-26 23:44:16 -06:00
Cruix
8465defbb0
Modified the starting locations of advanced camera console eyes ( #33759 )
...
* Modified the starting locations of advanced camera console eyes
Made shuttle navigation computers no longer work on z levels they are not locked to
* Advanced camera eyes do not start on the console if they use static and the console is in camera view but not on a usable z-level
2017-12-25 19:14:33 -06:00
vuonojenmustaturska
fcceb5ec77
Finishes the forceMove port
2017-12-14 15:40:08 -06:00
Cruix
746e57bd86
Allowed shuttle docking ports to be hidden from some shuttle docking computers
2017-12-10 14:23:08 -06:00
Jordan Brown
8b9e15d1b5
Merge pull request #33324 from deathride58/foreignfurryaddswidescreen
...
[Ready] Makes the default view range a config option (Allows hosts to enable widescreen)
2017-12-08 10:35:23 -06:00
Cruix
e9f307af8e
Fixed a rare custom shuttle docker client crash ( #33086 )
2017-11-27 11:46:32 -06:00
Emmett Gaines
0b07f80b62
custom docker improvements ( #32626 )
2017-11-24 12:59:17 -06:00
Tad Hardesty
a0801a8e92
Scale fullscreen overlays to the view size
2017-11-05 04:52:40 -06:00
CitadelStationBot
f6331eedf8
[MIRROR] Shuttle navigation computers ignore the shuttle when placing a new location ( #3596 )
...
* Shuttle navigation computers ignore the shuttle when placing a new location (#31722 )
* Fixed the shuttle navigation computer allowing you to move stationary docking ports
* Made the shuttle navigation computer ignore the shuttle it controls when determining valid turfs
* Removed a redundant list
* Moved a var from stationary docking ports to mobile docking ports
* Removed a sanity check
* Shuttle navigation computers ignore the shuttle when placing a new location
2017-10-25 20:03:11 -05:00
Emmett Gaines
8a336215f1
Next round of shuttle fixes at the cost of a small piece of my sanity ( #31784 )
...
* shuttle bugs begone
* cleanup
2017-10-17 12:00:46 -05:00
Cruix
f2f2f349ca
Fixed the shuttle navigation computer allowing you to move docking ports ( #31721 )
...
* Fixed the shuttle navigation computer allowing you to move stationary docking ports
* Moved a var from stationary docking ports to mobile docking ports
* Removed a sanity check
2017-10-16 23:02:02 -05:00
Jordan Brown
4d110d9b70
Merge pull request #31661 from ninjanomnom/custom-docker
...
Fixes custom shuttle docker display
2017-10-14 18:55:03 -05:00
KorPhaeron
6fca708b33
Advanced camera consoles use a list for z lock rather than a single z level ( #30661 )
...
* Refactor Abductor Console
* Station lock
2017-09-28 10:44:12 -05:00
KorPhaeron
d05fdb0eb0
Makes the station Z level into a list instead of a single define
2017-09-11 12:40:35 -05:00
kevinz000
c638386507
Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. ( #2460 )
...
* fuck pubby
* fuck you too ceres
* ree
* this is going to be a disaster isn't it
* disaster
* dme
* -_-
* tg
* woops
* proper sync
* Welcome to conflict hell.
* lets hope this fixes more things than it breaks
* gdi
* goddamnit
2017-08-24 21:07:58 -07:00
