Commit Graph

414 Commits

Author SHA1 Message Date
LetterJay
bbef661092 Merge pull request #3927 from Citadel-Station-13/upstream-merge-32481
[MIRROR] [READY]integrated circuitry port+upgrade.
2017-11-14 15:51:03 -06:00
LetterJay
c3b60e502e Merge pull request #3882 from Citadel-Station-13/upstream-merge-32371
[MIRROR] SSoverlay improvements and tweaks
2017-11-14 14:56:34 -06:00
arsserpentarium
d8847ea167 [READY]integrated circuitry port+upgrade. 2017-11-14 05:00:48 -06:00
LetterJay
36778e9404 Merge pull request #3919 from Citadel-Station-13/upstream-merge-32623
[MIRROR] Adds ambience for Reebe.
2017-11-13 11:53:21 -06:00
LetterJay
304cfeb262 Merge pull request #3914 from Citadel-Station-13/upstream-merge-31947
[MIRROR] Pirate ship event
2017-11-13 11:52:40 -06:00
LetterJay
07cb443ba0 Merge pull request #3913 from Citadel-Station-13/upstream-merge-32553
[MIRROR] Xrays go through walls but stop on mobs/blob
2017-11-13 11:51:59 -06:00
LetterJay
a21a5cf30d Merge pull request #3906 from Citadel-Station-13/upstream-merge-32640
[MIRROR] Adds a multitool_act and a proper check on tool_check
2017-11-13 11:46:41 -06:00
LetterJay
55e2d08b06 Merge pull request #3901 from Citadel-Station-13/upstream-merge-32566
[MIRROR] Space vacuum damage doubled
2017-11-13 11:44:33 -06:00
LetterJay
4142105fe6 Merge pull request #3895 from Citadel-Station-13/upstream-merge-32435
[MIRROR] Disposal pipes and pipe dispensers refactor
2017-11-13 11:44:04 -06:00
LetterJay
34b3607211 Merge pull request #3867 from Citadel-Station-13/upstream-merge-32504
[MIRROR] Weakrefs
2017-11-13 11:41:38 -06:00
LetterJay
9ff35c5b2c Merge branch 'master' into upstream-merge-32435 2017-11-13 11:30:06 -06:00
Qustinnus
182b81a721 Adds ambience for Reebe. (#32623)
* spooky

* fix 1

* fix 2
2017-11-13 03:45:03 -06:00
oranges
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
oranges
033f336ed1 Merge pull request #32553 from ExcessiveUseOfCobblestone/ihategoofxray
Xrays go through walls but stop on mobs/blob
2017-11-13 03:17:24 -06:00
LetterJay
7e6283a3f0 Merge branch 'master' into upstream-merge-32504 2017-11-12 23:11:53 -06:00
LetterJay
9fefd15f66 Merge branch 'master' into upstream-merge-32247 2017-11-12 23:09:10 -06:00
LetterJay
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
Leo
fffe2ea0c0 Adds a multitool_act and a proper check on tool_check (#32640) 2017-11-12 19:12:46 -06:00
nicbn
1b5a1c369b Space vacuum damage doubled (#32566) 2017-11-12 12:54:43 -06:00
LetterJay
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
LetterJay
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
ACCount
500307b034 Disposal pipes and pipe dispensers refactor 2017-11-12 00:31:00 -06:00
LetterJay
6286f4d4c2 Merge branch 'master' into upstream-merge-32161 2017-11-11 23:02:13 -06:00
Leo
73cb2ead88 Items no longer need to check for tools in attackby 2017-11-11 14:31:12 -06:00
Kyle Spier-Swenson
2d8fc6de61 SSoverlay improvements and tweaks (#32371)
* Overlay per-type cost logging.

Overlays will now log how long each type took to process.

Changed up how overlays was done to account for the fact its a queue and not a processor. (it was using almost none of the processing subsystem framework)

Made the overlay loop faster by making it not cut the list until the end.

Added a simple generic benchmark stat tracking system.

I don't know how much overhead this adds to overlays. i may put it behind testing or something, but i do want to test this on the serbers to get some stats.

* Removes flush() as it was creating race conditions

* Use ref

* text2file

* Atoms added as an overlay will have their pending overlays compiled before being converted to an appearance
2017-11-10 13:26:23 -06:00
as334
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
swindly
3fa561c3b1 fixes spelling and stuff (#32531) 2017-11-09 11:04:50 -06:00
CitadelStationBot
cde4d39989 [MIRROR] isatom is now an alias for isloc (#3861)
* isatom is now an alias for isloc (#32514)

isloc() returns true on anything that can be a loc. Only atoms can be a loc. Its basically isatom, but with a odd ass name.

It, like other builtin byond is* procs, uses typeid to check, not istype, saving the standard mess of recursive type searching that istype uses, thus its faster.

* isatom is now an alias for isloc
2017-11-09 05:35:35 -08:00
kevinz000
b44e31951d Weakrefs 2017-11-09 00:49:01 -06:00
LetterJay
ea44e4a1d9 Merge pull request #3857 from Citadel-Station-13/upstream-merge-32489
[MIRROR] Global vest lists
2017-11-08 02:21:36 -06:00
LetterJay
448326cd60 Merge pull request #3856 from Citadel-Station-13/upstream-merge-32466
[MIRROR] Fixes turf_decal layering
2017-11-08 02:21:13 -06:00
LetterJay
56415d62d3 Merge pull request #3847 from Citadel-Station-13/upstream-merge-32448
[MIRROR] (Hopefully!) Final clockwork marauder balancing pass
2017-11-08 01:44:51 -06:00
ShizCalev
5f5f313551 Global vest lists (#32489)
* Global vest lists

* revised coat

* Fixed duped proc
2017-11-07 23:57:57 -06:00
ShizCalev
88e7e8d2cb Fixes turf_decal layering 2017-11-07 21:38:53 -06:00
Ashe Higgs
577d1b7d20 Marauder balancing pass (#32448) 2017-11-07 09:57:26 -06:00
Leo
4bd172f7da Merge pull request #32465 from MoreRobustThanYou/patch-11
Removes some unused clockwork defines
2017-11-07 08:00:05 -06:00
LetterJay
9e28d79b8c Merge pull request #3775 from Citadel-Station-13/upstream-merge-32334
[MIRROR] Adds around 30 new ambience sounds, and changes ambience code a little bit
2017-11-07 03:49:46 -06:00
LetterJay
23d6ccb27a Update sound.dm 2017-11-04 22:44:01 -05:00
nicbn
46c62b6293 overhaul (#32316) 2017-11-03 23:40:27 -05:00
Qustinnus
d475149e8d Adds around 30 new ambience sounds, and changes ambience code a little bit 2017-11-03 15:53:09 -05:00
Emmett Gaines
a9f07518a7 Shuttle rotation refactor and significant performance upgrade 2017-10-31 20:23:57 -05:00
oranges
c5e11eceed Some minor contamination fixes 2017-10-31 15:30:53 -05:00
LetterJay
47cfffbb26 Merge pull request #3648 from Citadel-Station-13/upstream-merge-32116
[MIRROR] Line by line profiling system
2017-10-29 15:48:47 -04:00
Jordan Brown
4b297f509e 512 forward compatibility merge 2017-10-29 10:28:36 -05:00
LetterJay
f900f2ea9a Merge pull request #3660 from Citadel-Station-13/upstream-merge-31864
[MIRROR] Makes thermite a component
2017-10-29 04:23:16 -04:00
LetterJay
1005211741 Merge pull request #3654 from Citadel-Station-13/upstream-merge-32130
[MIRROR] [s] Makes ImmediateInvokeAsync a world proc
2017-10-29 03:47:12 -04:00
LetterJay
4b300cee6c Merge branch 'master' into upstream-merge-32116 2017-10-29 03:45:59 -04:00
LetterJay
74a33169cb Merge pull request #3642 from Citadel-Station-13/upstream-merge-32051
[MIRROR] More radiation balance changes and fixes
2017-10-29 02:41:44 -04:00
LetterJay
3b91f4efcc Merge branch 'master' into upstream-merge-32096 2017-10-29 01:49:22 -04:00
LetterJay
e150fe28b6 Merge branch 'master' into upstream-merge-31877 2017-10-28 23:57:51 -04:00