e83b175f30
Merge pull request #3953 from Citadel-Station-13/upstream-merge-32729
...
[MIRROR] removes an unused var from radio code
2017-11-15 11:05:19 -06:00
607294a2b6
Merge pull request #3952 from Citadel-Station-13/upstream-merge-32630
...
[MIRROR] Alternative grille sprite update
2017-11-15 11:02:04 -06:00
f45006ef57
Merge pull request #3947 from Citadel-Station-13/upstream-merge-32719
...
[MIRROR] Fixes a runtime with glowshrooms
2017-11-15 10:41:41 -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
16019df886
Merge branch 'master' into upstream-merge-32280
2017-11-15 10:21:04 -06:00
156aa30c61
Merge pull request #32729 from Qustinnus/cheapGBP
...
removes an unused var from radio code
2017-11-15 01:27:24 -06:00
c4789d497a
Alternative grille sprite update ( #32630 )
...
* Update grille sprite
* Add damaged grille sprite
* Add 4 varients to the damaged grille
2017-11-14 23:55:25 -06:00
809951c56c
Merge pull request #3326 from Citadel-Station-13/upstream-merge-31176
...
[MIRROR] loc -- > forcemove
2017-11-14 15:58:20 -06:00
62c7cfc4e7
Merge pull request #3938 from Citadel-Station-13/upstream-merge-32689
...
[MIRROR] Fixes a bunch of hand tele/portal issues.
2017-11-14 15:56:08 -06:00
a970bc2283
Fixes a runtime with glowshrooms ( #32719 )
2017-11-14 15:36:53 -06:00
8136148303
Minor speedups to movement: First Blood Part 2
2017-11-14 15:00:45 -06:00
eba429f5b1
Hand teleporter and portal fixes. ( #32689 )
2017-11-14 13:11:55 -06:00
8868a354b6
Update multitool.dm
2017-11-14 13:06:43 -06:00
d8847ea167
[READY]integrated circuitry port+upgrade.
2017-11-14 05:00:48 -06:00
648477ebe1
Merge pull request #3917 from Citadel-Station-13/upstream-merge-32637
...
[MIRROR] Adds a timer to falsewall code
2017-11-13 11:53:08 -06:00
304cfeb262
Merge pull request #3914 from Citadel-Station-13/upstream-merge-31947
...
[MIRROR] Pirate ship event
2017-11-13 11:52:40 -06:00
32bfa75c3a
Merge pull request #3908 from Citadel-Station-13/upstream-merge-32558
...
[MIRROR] Prevent placing posters on diagonal wall corners
2017-11-13 11:50:36 -06:00
0a21e6e83b
Merge pull request #3904 from Citadel-Station-13/upstream-merge-32642
...
[MIRROR] Makes clown box consistent with the rest of the boxes
2017-11-13 11:45:13 -06:00
9ff35c5b2c
Merge branch 'master' into upstream-merge-32435
2017-11-13 11:30:06 -06:00
3c35202b5e
Performance and usability improvement for blueprints
2017-11-13 03:32:35 -06:00
a0f70c9364
Adds a timer to falsewall code ( #32637 )
...
* Adds a timer to falsewall code
* better code
* removes a parameter
2017-11-13 03:29:21 -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
96b30fa61e
Prevent placing posters on diagonally-smoothed walls ( #32558 )
...
Posters are also knocked off the walls if they change to being
diagonally smoothed later.
2017-11-13 02:33:30 -06:00
3ea8808201
Merge pull request #3673 from Citadel-Station-13/upstream-merge-32161
...
[MIRROR] 512 forward compatibility merge
2017-11-12 23:06:55 -06:00
aa020ea9e8
Update electropack.dm
2017-11-12 16:00:15 -06:00
89b23905b5
Makes clown box consistent with the rest of the boxes
2017-11-12 15:57:01 -06:00
de8e064e45
Update electropack.dm
2017-11-12 15:42:44 -06:00
1c8d9b3a4e
Update electropack.dm
2017-11-12 10:38:30 -06:00
77d261aa8a
Update camera_bug.dm
2017-11-12 10:02:32 -06:00
298ddc8fa9
Update scrolls.dm
2017-11-12 08:56:30 -06:00
07afeccfe9
Merge pull request #3885 from Citadel-Station-13/upstream-merge-32602
...
[MIRROR] Items no longer need to check for tools in attackby
2017-11-12 08:21:26 -06:00
9b406f88a7
Merge pull request #3879 from Citadel-Station-13/upstream-merge-32400
...
[MIRROR] Assmos tweaks/minor additions.
2017-11-12 08:21:09 -06:00
7eccc3b2db
Merge pull request #3875 from Citadel-Station-13/upstream-merge-32445
...
[MIRROR] ok now i kinda tested the ark examine
2017-11-12 08:19:30 -06:00
c2d3ad9c3f
Update RPD.dm
2017-11-12 08:15:18 -06:00
500307b034
Disposal pipes and pipe dispensers refactor
2017-11-12 00:31:00 -06:00
6286f4d4c2
Merge branch 'master' into upstream-merge-32161
2017-11-11 23:02:13 -06:00
73cb2ead88
Items no longer need to check for tools in attackby
2017-11-11 14:31:12 -06:00
108e04e525
Merge pull request #3884 from Citadel-Station-13/upstream-merge-32567
...
[MIRROR] [s] Fixes RPDs qdel'ing girders and causing runtimes
2017-11-11 12:40:24 -06:00
35a49d5178
Merge pull request #3873 from Citadel-Station-13/upstream-merge-32516
...
[MIRROR] removes pipe construction cache
2017-11-11 12:38:45 -06:00
fc04d94a29
Merge pull request #3870 from Citadel-Station-13/upstream-merge-32530
...
[MIRROR] Makes editing movements delay configs have an effect again
2017-11-11 12:37:59 -06:00
59f654f8b9
[s] Fixes RPDs qdel'ing girders and causing runtimes ( #32567 )
...
* fixes qdeling girders and lattices with RPDs and other weird edge cases
* thanks mom the shitcode's cleaner now
* 👍
2017-11-10 17:55:12 -06:00
7f9800e8fa
Assmos tweaks/minor additions. ( #32400 )
...
* Adds pluoxium formation, makes fusion radioactive and nerfs it, makes noblium cost more energy.
* Review response.
* tanks now melt above 1 Million degrees Kelvin.
2017-11-10 01:31:16 -06:00
ecf49cd0a0
ok now i kinda tested the ark examine ( #32445 )
...
* No, I did NOT test the Ark examine.
* Update countdown.dm
* Update ark_of_the_clockwork_justicar.dm
* Update ark_of_the_clockwork_justicar.dm
* OK JOAN FIXED
* Update ark_of_the_clockwork_justicar.dm
2017-11-09 20:57:39 -06:00
3c8eef9243
removes pipe construction cache ( #32516 )
2017-11-09 11:14:43 -06:00
248d63fa3a
Makes editing movements delay configs have an effect again ( #32530 )
2017-11-09 11:06:03 -06:00
3fa561c3b1
fixes spelling and stuff ( #32531 )
2017-11-09 11:04:50 -06:00
d6e5942baf
Merge branch 'master' into upstream-merge-31176
2017-11-09 03:24:38 -06:00
0473aedc1c
Merge pull request #3858 from deathride58/boxfixesandothersyncs
...
Map syncs with upstream + small Boxstation fixes and tweaks
2017-11-09 03:18:34 -06:00
41b60c6d1e
Merge pull request #3845 from Citadel-Station-13/upstream-merge-32441
...
[MIRROR] Crayon rotation as a type var
2017-11-09 03:18:17 -06:00
2f21f16b53
initial commit - syncs and fiXES EVERYTHING WRONG ABOUT BOX HOLY FUCK HOW DID NOBODY REPORT ALL THIS SHIT
2017-11-08 17:04:20 -05:00
CitadelStationBot