shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,121 Commits 5 Branches 0 Tags
42fa4e36d5807b8c315efeda0fa89aa697151aba
Commit Graph

242 Commits

Author SHA1 Message Date
Jordan Brown
e5eaea8fe1 Merge pull request #38014 from tgstation/KorPhaeron-patch-1 
Fixes luxury shuttle forcefields vanishing
 2018-05-25 10:50:34 -05:00
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
Emmett Gaines
b866e62673 Fixes jumpToNullSpace (#37442) 
woops
 2018-04-27 13:05:44 -05:00
Poojawa
5518efebea everything but mob stuff 2018-04-23 01:06:17 -05:00
oranges
20823c0c1b Merge pull request #37237 from AutomaticFrenzy/patch/shuttle-airlocks 
Fix cycle-linked airlocks on shuttles
 2018-04-19 03:15:01 -05:00
vuonojenmustaturska
afeae1e446 fixes borgs being able to send the ferry 2018-04-15 12:39:52 -05:00
deathride58
f33d77a073 Merge pull request #6323 from Citadel-Station-13/upstream-merge-37065 
[MIRROR] Fixes escape pods not getting to their default destination
 2018-04-10 07:47:00 +00:00
deathride58
96191b8b6a Update emergency.dm 2018-04-10 03:15:27 -04:00
deathride58
e0d7630c19 Merge branch 'master' into synctesting 2018-04-09 21:43:26 +00:00
Emmett Gaines
fd8a80d6cb Fixes escape pods not getting to their default destination 2018-04-09 05:24:55 -05:00
vuonojenmustaturska
0372a042ad Merge pull request #37042 from ninjanomnom/just-the-area-I-needed 
Fixes underlying area grabbing subtypes
 2018-04-09 05:22:42 -05:00
Poojawa
5fa001c10f things with stuff (#6233) 
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
 2018-04-07 23:07:09 -04:00
kevinz000
e8561ec98c Shuttle garbage collection (#36871) 
* Shuttle garbage collection

* istype
 2018-04-07 19:50:27 -05:00
CitadelStationBot
1d6d8b454c [MIRROR] Defaults auxbase/escape pod/assault pod/elevator port timidity to FALSE (#6017) 
* Defaults auxbase/escape pod/assault pod/elevator port timidity to FALSE

* FUCK (#36483)

F A L S E
semicolon be gone
 2018-03-19 21:12:46 -05:00
oranges
11d1119d6f Merge pull request #36409 from Cruix/disease_shuttle 
Fixed cameras holding up the arrival shuttle
 2018-03-17 07:53:44 -05:00
Poojawa
6c7da493d9 Reee mirror bot. Hard syncs some missed PR stuff + maps (#5951) 
* maps and tgui

* missed defines and helpsers

* controller things

* datums

* game folder stuff

* module things

* icons

* stragglers

* map sync and updating

wew lad
 2018-03-14 16:49:40 -05: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
CitadelStationBot
18ace46af8 [MIRROR] Improves the shuttle error to include jump links and destination (#5900) 
* Improves the shuttle error to include jump links and destination (#36305)

* Improves the shuttle error to include jump links and destination
 2018-03-10 23:09:15 -06:00
CitadelStationBot
2570cefb40 [MIRROR] Fixes shuttles breaking when the turf the mobile dock is on is removed (#5880) 
* Fixes shuttles breaking when the turf the mobile dock is on is removed (#36261)

* Fixes shuttles breaking when the turf the mobile dock is on is removed
 2018-03-10 07:37:58 -06:00
deathride58
b587eb32c0 Merge pull request #5872 from Citadel-Station-13/upstream-merge-36254 
[MIRROR] Disables advanced shuttle navigation consoles during nuclear war ops
 2018-03-09 22:10:22 +00: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
deathride58
a62aa577f1 Merge pull request #5854 from Citadel-Station-13/upstream-merge-36055 
[MIRROR] Techwebs update: Protolathe/Circuit imprinters combined into techfabs!
 2018-03-09 19:25:12 +00:00
vuonojenmustaturska
f8d783ae70 Disables advanced shuttle navigation consoles during nuclear war ops 2018-03-09 12:49:44 -06:00
kevinz000
91ac70a73e RND TECHWEBS: TECHFABS (#36055) 
Doing my little update piece by piece because I'm lazy and because storage PR is going to conflict everything ever.

Techfabs do not link to RND consoles, and have their own interface for producing things.
RND production machinery code refactored.
Techwebs have categories views instead of just a goddamn design list.
Old machinery will be kept in, as some places will keep them. Read: Engineering, robotics, etc.

experimental: Protolathes and circuit imprinters combined/changed to techfabs. All departments can now print related circuit boards. Engineering and science will keep their lathe/imprinter design by default at roundstart because they have specialized labs for those.
 2018-03-07 21:11:56 -06:00
Dax Dupont
72e3ffa562 Beacons are no longer radios (#36070) 
* Refactors beacons

* Updates maps

* Done

* aaddddasddsafsdf
 2018-03-07 14:43:25 -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
kevinz000
1309f0a22f Disables emagging Centcom Ferry (#35579) 2018-02-14 10:19:50 -06:00
vuonojenmustaturska
0d40303254 Merge pull request #35558 from praisenarsie/patch-28 
fulton pack not allowed on supply shuttle
 2018-02-12 09:07:02 -06:00
Jordan Brown
c554bc8c47 Removes uneedful code 2018-02-09 14:23:45 -06:00
CitadelStationBot
9e229691cc Fixes clockwork sigil candidate runtime, cleans up some jobban checks with defines (#5304) 2018-02-05 04:23:09 -06:00
Poojawa
03086dfa91 Tg 1 28 sync testing/confirmation (#5178) 
* maps, tgui, tools

* defines and helpers

* onclick and controllers

* datums

fucking caught that hulk reversal too.

* game and shuttle modular

* module/admin

* oh god they fucking moved antag shit again

* haaaaate. Haaaaaaaaaate.

* enables moff wings

* more modules things

* tgstation.dme

before I forget something important

* some mob stuff

* s'more mob/living stuff

* some carbon stuff

* ayy lmaos and kitchen meat

* Human stuff

* species things

moff wings have a 'none' version too

* the rest of the module stuff.

* some strings

* misc

* mob icons

* some other icons.

* It compiles FUCK BORERS

FUCK BORERS
 2018-01-29 04:42:29 -06:00
MoreRobustThanYou
53d37098fc Shuttles will now throw you when taking off 
🆑 SPACE CONDUCTOR
tweak: Shuttles will throw you around if ya don't buckle in
/🆑
 2018-01-24 14:15:51 -06:00
Emmett Gaines
2054fc6433 lets check_dock be silent (#34614) 2018-01-21 12:34:42 -06:00
Jordan Brown
3bc7163a8f Merge pull request #34609 from ninjanomnom/leftover-checktick 
removed an extra checktick that could cause issues in shuttles
 2018-01-19 09:04:06 -06:00
kevinz000
47c74443da Fixes negative auth coutns 2018-01-16 07:40:29 -06:00
deathride58
aabbbb9dff aaaand the rest of the modules folder 2018-01-04 01:45:38 -05:00
LetterJay
f2f6d9d910 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829 
# Conflicts:
#	code/modules/events/alien_infestation.dm
#	code/modules/events/spider_infestation.dm
#	code/modules/events/vent_clog.dm
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
 2018-01-02 05:16:13 -06:00
LetterJay
b49009d481 Merge pull request #4454 from Citadel-Station-13/upstream-merge-33621 
[MIRROR] removes silly garbage defines
 2018-01-02 04:52:57 -06:00
LetterJay
30d4b25aee Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829 2018-01-01 14:09:07 -06:00
LetterJay
168519c328 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-32311 2018-01-01 07:00:34 -06:00
LetterJay
dae3c3efb5 Merge branch 'master' into upstream-merge-33621 2017-12-30 13:23:39 -06:00
LetterJay
b260704381 Merge pull request #4530 from Citadel-Station-13/upstream-merge-33705 
[MIRROR] Turns the baseturf var into a part time list
 2017-12-30 13:19:00 -06:00
LetterJay
68b44e73f4 Merge pull request #4533 from Citadel-Station-13/upstream-merge-33734 
[MIRROR] Makes cyclelinkeddir rotate with shuttle
 2017-12-30 05:06:32 -06:00
LetterJay
a3ebaa5de8 Merge branch 'master' into upstream-merge-32311 2017-12-29 18:38:50 -06:00
LetterJay
ac7750202b Update shuttle_rotate.dm 2017-12-29 18:38:05 -06:00
Tad Hardesty
0418ee4df6 Replace explicit z-level checks with defines 2017-12-29 13:41:10 -06: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
oranges
269208f687 [READY]Component Forensics and Item Blood OverlayS! 2017-12-27 15:19:14 -06:00