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
2e6b034493
save point - a lot of shit to fix
2017-12-27 07:03:40 -06:00
91e87bf801
Merge pull request #4482 from Citadel-Station-13/upstream-merge-33584
...
[MIRROR] Tiles blessed by holy water now block servant warp-in/Eminence snooping
2017-12-25 21:27:17 -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
ac5503d338
Merge branch 'master' into upstream-merge-33055
2017-12-25 04:10:34 -06:00
164db7ae9b
Prefixed all disability defines with DISABILITY_ to fix a name collision
2017-12-24 15:03:30 -06:00
c5485faee7
Tiles blessed by holy water now block servant warp-in/Eminence snooping ( #33584 )
...
* Blessing tiles blocks servant warp
* Removes the color
* Prevents the message from showing on the same turf
2017-12-21 06:37:06 -06:00
2b434438e0
Update telecrystalconsoles.dm
2017-12-19 19:31:17 -06:00
f3e031fe2f
Update telecrystalconsoles.dm
2017-12-19 18:02:16 -06:00
408182758f
Merge branch 'master' into upstream-merge-33498
2017-12-19 17:50:11 -06:00
3af0aa2489
[Ready Again]Refactors disabilities into lists, allowing for independent disability sources
2017-12-18 15:19:53 -06:00
f377aa441f
Update telecrystalconsoles.dm
2017-12-17 15:56:54 -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
fcceb5ec77
Finishes the forceMove port
2017-12-14 15:40:08 -06:00
7f90427a40
Replaces a bunch of loc assignments with forcemoves and moves to nullspace
2017-12-13 13:56:57 -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
4204c889ed
Merge pull request #32964 from AutomaticFrenzy/patch/joules
...
Measure energy values in joules
2017-12-05 03:23:06 -06:00
21d5e8999c
Merge branch 'master' into upstream-merge-32624
2017-12-04 17:12:53 -05:00
6d8d9802d4
Merge pull request #33153 from AnturK/adv_cam_cleanup
...
Fixes some advanced camera issues
2017-11-30 17:00:46 -06:00
d9c650970c
making prs isn't even worth it anymore ( #33056 )
2017-11-24 22:36:22 -06:00
8943bf0184
Merge pull request #33041 from MrStonedOne/patch-452
...
Lowers the stress the dna console puts on the string tree
2017-11-23 12:07:17 -06:00
cec6c028f5
[READY]Refactors uplinks to a component!
2017-11-22 15:17:03 -06:00
1f6b3ce629
Merge branch 'master' into upstream-merge-32188
2017-11-21 19:53:58 +00:00
35af5e49aa
Fixes computers deleting on build ( #32942 )
...
* Fixes computers deleting on build
* Removed src
2017-11-21 02:43:34 -06:00
d2b251d23c
Merge pull request #4041 from Citadel-Station-13/upstream-merge-32844
...
[MIRROR] Cleans up unused code
2017-11-21 04:15:11 +00:00
f9b5c04cd3
Update buildandrepair.dm
2017-11-20 13:45:39 -05:00
2498e1ddc0
Cleans up unused code
2017-11-20 10:14:32 -06:00
aea13f75cd
Allows rotating computer frames, fixes rotation on deconstruction, switches dropped materials to use drop_location()
2017-11-20 03:08:10 -06:00
571985ca5d
Merge pull request #32864 from ike709/dir
...
Fixes some computer dirs
2017-11-19 22:42:28 -06:00
04d290aa11
Merge pull request #3967 from Citadel-Station-13/upstream-merge-32775
...
[MIRROR] Makes the operation computer tgui
2017-11-18 05:38:59 +00:00
eeba86e27e
Merge branch 'master' into upstream-merge-32188
2017-11-18 05:31:42 +00:00
b7e99a7448
JSON feedback
2017-11-17 01:44:12 -06:00
8f8193d0f6
Update Operating.dm
2017-11-16 21:10:06 -05:00
6ce69fb2c8
Replaces a bunch of mob loops with hopefully better ones
2017-11-16 16:09:15 -06:00
3fbe3bdd63
Makes the operation computer tgui
2017-11-16 14:29:18 -06:00
163ef812fb
Merge pull request #3945 from Citadel-Station-13/upstream-merge-32702
...
[MIRROR] Minor speedups to movement: First Blood Part 2
2017-11-15 10:41:16 -06:00
46ba6cbc7b
Merge pull request #3943 from Citadel-Station-13/upstream-merge-32620
...
[MIRROR] Greatly increases the performance of station-ending plasma fires
2017-11-15 10:40:40 -06:00
ccc9158819
Update station_alert.dm
2017-11-14 16:06:54 -06:00
8136148303
Minor speedups to movement: First Blood Part 2
2017-11-14 15:00:45 -06:00
157998e974
Greatly increases the performance of station-ending plasma fires
2017-11-14 13:51:45 -06:00
a23935c037
Directional computer sprites ( #32656 )
...
Technically I did fix it. It just wasn't a good fix. That's a good description of most of my coding.
2017-11-14 05:01:09 -06:00
43113cd9b5
Merge pull request #31947 from AnturK/yarr
...
How does this work:
Station receives a communication extorting current cargo point, if they answer yes the points are just gone and nothing of interest happens.
If station refuses to pay or is silent for 3 minutes, pirate shuttle spawns somewhere in space.
There's an internal GPS onboard so crew will always be able to follow the shuttle.
Crew of 3, moderately armed. (Balance pending)
Shuttle engines have 3 minute cooldown between jumps.
Special shuttle equipment will block cargo and emergency shuttles from leaving and slowly steal the points.
2017-11-13 03:19:38 -06:00
81d1abe64e
Update message.dm
2017-11-12 08:09:12 -06:00
6286f4d4c2
Merge branch 'master' into upstream-merge-32161
2017-11-11 23:02:13 -06:00
7b791899b2
Update robot.dm
2017-11-11 15:54:57 -06:00
3fa561c3b1
fixes spelling and stuff ( #32531 )
2017-11-09 11:04:50 -06:00
31e2303e39
Merge pull request #3500 from Citadel-Station-13/upstream-merge-31849
...
[MIRROR] Comms console tweak
2017-10-31 07:58:15 -04:00
LetterJay