Commit Graph
1394 Commits
Author SHA1 Message Date
vuonojenmustaturskaandCitadelStationBot 6ce69fb2c8 Replaces a bunch of mob loops with hopefully better ones 2017-11-16 16:09:15 -06:00
deathride58andGitHub f6e4e77b80 Merge pull request #3962 from Citadel-Station-13/upstream-merge-32743
[MIRROR] Fixes pipe dispensers being unable to dispense bent pipes
2017-11-16 17:26:18 +00:00
ACCountandCitadelStationBot 1b9280776e Fixes pipe dispensers being unable to dispense bent pipes (#32743)
* Fixes pipe dispensers not dispensing bent pipes

* Updates meter RPD icon file to the one that's actually used
2017-11-15 19:12:34 -06:00
AutomaticFrenzyandCitadelStationBot cb7d45c980 actually use disable_warning mob_can_equip (#32750) 2017-11-15 19:07:01 -06:00
CitadelStationBotandGitHub 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
CitadelStationBotandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 16019df886 Merge branch 'master' into upstream-merge-32280 2017-11-15 10:21:04 -06:00
orangesandCitadelStationBot 156aa30c61 Merge pull request #32729 from Qustinnus/cheapGBP
removes an unused var from radio code
2017-11-15 01:27:24 -06:00
Matt SmithandCitadelStationBot 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
LetterJayandGitHub 809951c56c Merge pull request #3326 from Citadel-Station-13/upstream-merge-31176
[MIRROR] loc -- > forcemove
2017-11-14 15:58:20 -06:00
LetterJayandGitHub 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
MoreRobustThanYouandCitadelStationBot a970bc2283 Fixes a runtime with glowshrooms (#32719) 2017-11-14 15:36:53 -06:00
vuonojenmustaturskaandCitadelStationBot 8136148303 Minor speedups to movement: First Blood Part 2 2017-11-14 15:00:45 -06:00
kevinz000andCitadelStationBot eba429f5b1 Hand teleporter and portal fixes. (#32689) 2017-11-14 13:11:55 -06:00
LetterJayandGitHub 8868a354b6 Update multitool.dm 2017-11-14 13:06:43 -06:00
arsserpentariumandCitadelStationBot d8847ea167 [READY]integrated circuitry port+upgrade. 2017-11-14 05:00:48 -06:00
LetterJayandGitHub 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
LetterJayandGitHub 304cfeb262 Merge pull request #3914 from Citadel-Station-13/upstream-merge-31947
[MIRROR] Pirate ship event
2017-11-13 11:52:40 -06:00
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 9ff35c5b2c Merge branch 'master' into upstream-merge-32435 2017-11-13 11:30:06 -06:00
Emmett GainesandCitadelStationBot 3c35202b5e Performance and usability improvement for blueprints 2017-11-13 03:32:35 -06:00
nicbnandCitadelStationBot 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
orangesandCitadelStationBot 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
Tad HardestyandCitadelStationBot 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
LetterJayandGitHub 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
LetterJayandGitHub aa020ea9e8 Update electropack.dm 2017-11-12 16:00:15 -06:00
tortellinitonyandCitadelStationBot 89b23905b5 Makes clown box consistent with the rest of the boxes 2017-11-12 15:57:01 -06:00
LetterJayandGitHub de8e064e45 Update electropack.dm 2017-11-12 15:42:44 -06:00
LetterJayandGitHub 1c8d9b3a4e Update electropack.dm 2017-11-12 10:38:30 -06:00
LetterJayandGitHub 77d261aa8a Update camera_bug.dm 2017-11-12 10:02:32 -06:00
LetterJayandGitHub 298ddc8fa9 Update scrolls.dm 2017-11-12 08:56:30 -06:00
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub c2d3ad9c3f Update RPD.dm 2017-11-12 08:15:18 -06:00
ACCountandCitadelStationBot 500307b034 Disposal pipes and pipe dispensers refactor 2017-11-12 00:31:00 -06:00
LetterJayandGitHub 6286f4d4c2 Merge branch 'master' into upstream-merge-32161 2017-11-11 23:02:13 -06:00
LeoandCitadelStationBot 73cb2ead88 Items no longer need to check for tools in attackby 2017-11-11 14:31:12 -06:00
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
deathride58andCitadelStationBot 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
as334andCitadelStationBot 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
MoreRobustThanYouandCitadelStationBot 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
duncathan saltandCitadelStationBot 3c8eef9243 removes pipe construction cache (#32516) 2017-11-09 11:14:43 -06:00
Jordan BrownandCitadelStationBot 248d63fa3a Makes editing movements delay configs have an effect again (#32530) 2017-11-09 11:06:03 -06:00
swindlyandCitadelStationBot 3fa561c3b1 fixes spelling and stuff (#32531) 2017-11-09 11:04:50 -06:00