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
d8de375ada
Merge pull request #2936 from Citadel-Station-13/upstream-merge-30969
...
[MIRROR] DisplayTimeText mk2
2017-09-27 23:39:03 -04:00
1ea098b805
Update pod.dm
2017-09-27 19:10:48 -05:00
47a8ce6ae8
Merge pull request #2939 from Citadel-Station-13/upstream-merge-30863
...
[MIRROR] Bluespace pipes
2017-09-26 14:58:23 -04:00
0a43bddaa1
Merge pull request #30863 from pubby/bluepipe
...
Bluespace pipes
2017-09-25 12:28:14 -05:00
169aa85d9c
DisplayTimeText mk2
2017-09-24 18:59:57 -05:00
31f6898a87
Stops AIs from giving the borg a free secondary light ( #30913 )
...
* Stops AIs from giving the borg a free secondary light
* Using a camera var now
* Wrong if
* My brain is not working
2017-09-24 17:58:37 -05:00
3505e14b45
Airlocks are once again actually open when they appear to be open, instead of being uninteractable for a noticeable period ( #30899 )
...
* Airlocks are once again actually open when they appear to be open, instead of being uninteractable for a noticeable period
* tweak
* fix
2017-09-24 10:10:22 -05:00
a286d0c313
[MIRROR] Gives engineering cyborgs an item they can use in place of circuits for basic construction ( #2875 )
...
* Gives engineering cyborgs an item they can use in place of circuits for basic construction
* fixes
2017-09-22 23:35:54 -05:00
2a860d1954
[MIRROR] More Initialize() fixes, requires someone to test with DB ( #2857 )
...
* More Initialize() fixes, requires someone to test with DB
* fucking mirror failure
2017-09-22 23:35:22 -05:00
6efb76fad5
[MIRROR] Ammo cleanup ( #2643 )
...
* Ammo cleanup
* Update briefcase.dm
* Update manned_turret.dm
* Update mime.dm
* Update manned_turret.dm
* Update manned_turret.dm
* fixes
* mime memes
2017-09-22 22:30:44 -05:00
573a81a4d9
Reapplies material componets
2017-09-22 09:31:39 -05:00
41277ff110
Removes old debug text
2017-09-21 06:30:11 -05:00
7299854f8b
[MIRROR] Puts the computer circuit board back in nullspace where it supposedly belongs ( #2810 )
...
* Puts the computer circuit board back in nullspace where it supposedly belongs
* Update _computer.dm
2017-09-17 22:55:04 -05:00
4dd0dc9d66
[MIRROR] Various grammar fixes ( #2842 )
...
* Various grammar fixes
* Update mecha_parts.dm
* Update crates.dm
* Update ghost_role_spawners.dm
* Update paper_premade.dm
* Update oldstation.dm
2017-09-17 22:35:51 -05:00
8846708727
[MIRROR] Fixes cyborg airlock interaction ( #2827 )
...
* Fixes cyborg airlock interaction (#30809 )
* changes the sheet check to respect cyborgs
* Uses the proc instead of a hack that we wound need to fix again
* I can code totaly, yeah, sober...
* I cant posibly be drunk yet i only GOT the wine a minute ago
* Fixes cyborg airlock interaction
2017-09-17 22:25:59 -05:00
7cf4d0797b
Applies WRITE_FILE to Citadel saves + Belly clone fix ( #2694 )
...
* Applies WRITE_FILE to everything
* Maybe this works, actually
* HAHAH I FIXED IT FUCKOS
2017-09-17 02:26:27 -05:00
71719f6787
Update _computer.dm
2017-09-16 09:19:47 -05:00
1db4249fa1
[MIRROR] Adds Abandoned Airlocks ( #2784 )
...
* Adds Abandoned Airlocks (#30705 )
* Automatic changelog generation for PR #30056 [ci skip]
* Delete AutoChangeLog-pr-30056.yml
* Abandoned Airlocks
* Added to maps
* inclusive numbering
* Update airlock.dm
* Tweaks
* Capital ChangeTurf
* Update airlock.dm
* no more update_icons
* Abandoned paths (#4 )
* Abandoned paths
* Cleaned up dirty var
* Adds Abandoned Airlocks
2017-09-16 04:32:19 -05:00
7d34286803
[MIRROR] Fixes a bunch of computers ( #2766 )
...
* Fixes a bunch of computers (#30693 )
* Fixes a bunch of computers
2017-09-14 13:23:01 -05:00
099b6628fa
[MIRROR] Full jobs will no longer be shown as priority for latejoiners ( #2729 )
...
* Full jobs will no longer be shown as priority for latejoiners
* Update card.dm
2017-09-13 22:54:41 -05:00
d64c23b7f9
[MIRROR] Fix syndicate toy C20r and L6 Saw not having riot darts ( #2740 )
...
* Fix syndicate toy C20r and L6 Saw not having riot darts (#30645 )
* Add riot darts back into toy C20r and L6 Saw
Riot darts were removed from the unrestricted variants of these guns, also changed these ruins to use the new /riot variant in order to maintain original functionality.
* Comments are good
Especially when inheritance makes everything weird.
* Fix syndicate toy C20r and L6 Saw not having riot darts
2017-09-13 20:57:54 -05:00
34edb1b5e4
[MIRROR] Fixes the Orion Trail machine ( #2703 )
...
* Fixes the Orion Trail machine
* Update arcade.dm
2017-09-13 18:08:18 -05:00
9d52a495b2
[MIRROR] Fix monastery shuttle + Pods ( #2599 )
...
* Fix monastery shuttle + Pods
* actually ports podfix
2017-09-13 17:58:25 -05:00
083fc1a7b4
[MIRROR] Standardized power displays ( #2539 )
...
* Standardized power displays
* Update tgui.js
* Delete tgui.js.rej
2017-09-13 17:57:16 -05:00
cd0997aa1e
Merge branch 'master' into upstream-merge-30297
2017-09-12 23:36:35 -05:00
4ee17d5167
Merge pull request #2698 from Citadel-Station-13/upstream-merge-30583
...
[MIRROR] Fixes initialize hints for a fair number of mobs and items
2017-09-12 23:31:28 -05:00
a549f3128a
Update atmos_control.dm
2017-09-12 03:02:15 -05:00
deca859284
Update atmos_alert.dm
2017-09-12 03:00:11 -05:00
505925d767
Update atmos_alert.dm
2017-09-12 02:59:58 -05:00
dac6cc56e4
Merge branch 'master' into upstream-merge-30494
2017-09-12 02:40:24 -05:00
01b0e754c2
Merge pull request #2679 from Citadel-Station-13/upstream-merge-30531
...
[MIRROR] Adds Donksoft Toy Vendor (Machine Board) to the Circuit Imprinter
2017-09-12 02:35:17 -05:00
16c7706618
Merge branch 'master' into upstream-merge-30117
2017-09-11 18:10:15 -05:00
6cc0ea6af0
Merge pull request #2659 from Citadel-Station-13/upstream-merge-30412
...
[MIRROR] Regularizes resisting out of containers
2017-09-11 18:05:52 -05:00
b5c007ffdf
Update vending.dm
2017-09-11 17:50:56 -05:00
ea82bf9bfa
Update suit_storage_unit.dm
2017-09-11 17:47:48 -05:00
6d88e3642b
Update suit_storage_unit.dm
2017-09-11 14:27:28 -05:00
02d7a04fb1
Update suit_storage_unit.dm
2017-09-11 14:06:01 -05:00
d05fdb0eb0
Makes the station Z level into a list instead of a single define
2017-09-11 12:40:35 -05:00
053b283745
Fixes initialize hints for a fair number of mobs and items
2017-09-11 12:20:19 -05:00
63122795f9
Adds missing span-endings
2017-09-11 07:10:09 -05:00
d158ec9528
Adds Donksoft Toy Vendor (Machine Board) to the Circuit Imprinter
2017-09-10 03:43:09 -05:00
ba3f92fa17
Merge pull request #2671 from Citadel-Station-13/upstream-merge-30504
...
[MIRROR] Windoors open when emagged again
2017-09-09 01:05:30 -05:00
d60a6729d3
Merge pull request #30504 from YPOQ/windooremagfix
...
Windoors open when emagged again
2017-09-08 21:22:16 -05:00
25a5325e24
Merge pull request #30489 from Cyberboss/CompLightFix
...
Makes computers lose their light when their screens break
2017-09-08 21:01:39 -05:00
cf07ead653
Regularizes resisting out of containers
2017-09-08 09:58:34 -05:00
31102d0ec4
Merge pull request #2608 from Citadel-Station-13/upstream-merge-30262
...
[MIRROR] Soft crit, except not terrible
2017-09-07 10:01:35 -05:00
8299cf576c
this sure was FUN
2017-09-07 09:47:56 -05:00
17db844180
another mirror rebase for the PRMirror being down
2017-09-06 17:32:49 -05:00
bae0563d47
initial commit
2017-09-05 16:17:50 -05:00
KorPhaeron