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
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
72e3ffa562
Beacons are no longer radios ( #36070 )
...
* Refactors beacons
* Updates maps
* Done
* aaddddasddsafsdf
2018-03-07 14:43:25 -06:00
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
1309f0a22f
Disables emagging Centcom Ferry ( #35579 )
2018-02-14 10:19:50 -06:00
0d40303254
Merge pull request #35558 from praisenarsie/patch-28
...
fulton pack not allowed on supply shuttle
2018-02-12 09:07:02 -06:00
c554bc8c47
Removes uneedful code
2018-02-09 14:23:45 -06:00
9e229691cc
Fixes clockwork sigil candidate runtime, cleans up some jobban checks with defines ( #5304 )
2018-02-05 04:23:09 -06:00
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
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
2054fc6433
lets check_dock be silent ( #34614 )
2018-01-21 12:34:42 -06:00
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
47c74443da
Fixes negative auth coutns
2018-01-16 07:40:29 -06:00
aabbbb9dff
aaaand the rest of the modules folder
2018-01-04 01:45:38 -05:00
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
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
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
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
dae3c3efb5
Merge branch 'master' into upstream-merge-33621
2017-12-30 13:23:39 -06:00
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
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
a3ebaa5de8
Merge branch 'master' into upstream-merge-32311
2017-12-29 18:38:50 -06:00
ac7750202b
Update shuttle_rotate.dm
2017-12-29 18:38:05 -06:00
0418ee4df6
Replace explicit z-level checks with defines
2017-12-29 13:41:10 -06:00
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
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
269208f687
[READY]Component Forensics and Item Blood OverlayS!
2017-12-27 15:19:14 -06:00
e2d2c8cda0
Merge branch 'master' into upstream-merge-33627
2017-12-27 04:41:27 -06:00
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
95642e631f
Update shuttle.dm
2017-12-26 05:28:55 -06:00
9ece43116d
Makes cyclelinkeddir rotate with shuttle
2017-12-25 19:16:47 -06:00
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
9d0a4722e5
turns the baseturf var into a part time list ( #33705 )
2017-12-25 19:11:06 -06:00
6cfd346bdd
Tweaks the syndicate infiltrator so it's no longer lopsided. ( #33731 )
2017-12-22 10:35:47 -06:00
408182758f
Merge branch 'master' into upstream-merge-33498
2017-12-19 17:50:11 -06:00
0f2fd05e87
removes silly garbage defines
2017-12-19 08:02:18 -06:00
8cf30a65fb
dock() re-organization
2017-12-18 21:23:58 -06:00
3895eb9eac
Merge pull request #4375 from Citadel-Station-13/upstream-merge-33519
...
[MIRROR] Finishes the forceMove port
2017-12-17 20:28:07 -06:00
f875d4e176
Defines math, take 2
2017-12-17 10:02:43 -06:00
7af461539f
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
253c819bc1
TG Sync 12/15/17
...
s
s
2017-12-15 06:27:57 -08:00
c27c52cf58
Player Z-tracking, again
2017-12-14 17:35:35 -06:00
fcceb5ec77
Finishes the forceMove port
2017-12-14 15:40:08 -06:00
7ca4a29cac
Merge pull request #4354 from Citadel-Station-13/upstream-merge-33465
...
[MIRROR] Replaces a bunch of loc assignments with forcemoves and moves to nullspace
2017-12-14 03:54:31 +00:00
2afb3c0368
Fixed several bad type checks in shuttle procs ( #33497 )
2017-12-13 21:09:23 -06:00
7f90427a40
Replaces a bunch of loc assignments with forcemoves and moves to nullspace
2017-12-13 13:56:57 -06:00
367872f962
Merge pull request #33457 from ninjanomnom/check-your-tick
...
Check ticks some more in dock()
2017-12-12 13:05:49 -06:00
cc0b768c72
[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES ( #4014 )
...
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES
* resetting all the maps because we can worry about them later.
* Regexing
* I'm fucked
* Fixes
* .
* maps
* bleh
* ree
* fixes
2017-12-11 16:36:38 -08:00
9a0961c320
Merge pull request #33462 from ninjanomnom/dont-be-so-negative
...
Ordered turfs quickfix
2017-12-11 12:15:29 -06:00
71c3a8266a
Merge pull request #4318 from Citadel-Station-13/upstream-merge-33424
...
[MIRROR] Standardization of return_ordered_turfs
2017-12-11 00:06:54 +00:00
deathride58