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
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
4b297f509e
512 forward compatibility merge
2017-10-29 10:28:36 -05:00
d182acae7f
Merge pull request #3659 from Citadel-Station-13/upstream-merge-31723
...
[MIRROR] Restricts some more areas from servant warp, and lets admins start the Ark on non-clockcult rounds
2017-10-29 04:22:03 -04:00
2503a90dc0
Merge pull request #3585 from Michiyamenotehifunana/CX-sword
...
Adds fancy Energy Swords (and a toy version)
2017-10-29 03:56:27 -04:00
bea9365ea9
Merge branch 'master' into upstream-merge-32093
2017-10-29 02:27:52 -04:00
e150fe28b6
Merge branch 'master' into upstream-merge-31877
2017-10-28 23:57:51 -04:00
37bb75a645
Restricts some more areas from servant warp, and lets admins start the Ark on non-clockcult rounds ( #31723 )
...
* Cleans up clockcult code a little
* Another thing with servants_active
* Now it compiles
2017-10-27 17:36:31 -05:00
ef9c27ef0a
Roundstart species pref fixes/removes redundant species config
2017-10-26 12:00:56 -05:00
f5cb95ecd6
Update communications.dm
2017-10-25 16:19:03 -05:00
a027526ba4
Merge branch 'master' into upstream-merge-31849
2017-10-25 16:55:39 -04:00
70a2c466f3
manual mirror of upstream robotic surgery pr
2017-10-25 14:29:45 -04:00
54a51a2fdb
NEB Polishing
...
Toys now implemented in a better way, new sound effects, and new traitor variant.
2017-10-25 16:36:03 +08:00
f4e0eab993
fixes AIs being able to teleport the id card console inserted cards to their core ( #32003 )
...
* Update card.dm
* Update card.dm
2017-10-23 08:59:24 -05:00
b7fa4410ce
Update communications.dm
2017-10-22 10:46:32 -05:00
d25cb1ba5d
[MIRROR] Grammar fixes to atom descriptions ( #3165 )
...
* Grammar fixes to atom descriptions
* compile errors
2017-10-21 07:17:03 -05:00
adc2e46114
[MIRROR] Does some code standardization/consistency. ( #3161 )
...
* Does some code standardization/consistency.
* fixes merge conflict generation
* Missed a few, oops
* Update pierrot_throat.dm
2017-10-21 06:10:22 -05:00
e4f76a79a5
Allows species to be blocked from ever being roundstart, can now choose your Halloween species
2017-10-20 10:11:35 -05:00
b439b96865
Comms console tweak
2017-10-19 03:52:52 -05:00
04d26d561a
Radiation makes you vomit blood and more balance changes ( #31753 )
2017-10-18 09:25:11 -05:00
5bb7618aa9
Merge pull request #31671 from kingofkosmos/altclickejectidfromcomputers
...
ID ejecting from computers by alt-clicking
2017-10-14 18:48:13 -05:00
d6903bcf3c
Merge branch 'master' into upstream-merge-31601
2017-10-14 10:17:16 -04:00
bd7a0d65b5
Fix many instances of "the the"
2017-10-13 09:41:54 -05:00
55e8f6526c
Radiation rework and subsystem
2017-10-13 09:22:23 -05:00
075cb673c0
Remove drop_item, drop_item_v, put_in_hands_or_del
2017-10-07 12:37:06 -05:00
d9c77f628d
Fixes gen scanner timer
2017-10-01 17:03:52 -05:00
f621fb704b
Merge branch 'master' into upstream-merge-31069
2017-10-01 02:56:28 -04:00
04d071deda
Merge branch 'master' into upstream-merge-30763
2017-09-30 15:30:46 -04:00
9e48311632
Update cloning.dm
2017-09-30 14:27:04 -05:00
07c95ef168
Update aifixer.dm
2017-09-30 14:26:41 -05:00
47a65d829d
Merge branch 'master' into upstream-merge-29741
2017-09-30 13:35:47 -04:00
98d6927eb6
Cleanup to various loc assignments and nearby code
2017-09-30 08:10:52 -05:00
7df3c80a39
Update cloning.dm
2017-09-29 23:41:44 -05:00
e5ef3d2405
Configuration datum refactor
2017-09-28 21:37:53 -05:00
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
1ea098b805
Update pod.dm
2017-09-27 19:10:48 -05:00
deathride58