Commit Graph

40933 Commits

Author SHA1 Message Date
Leo 1d5eacd59f Merge pull request #33462 from ninjanomnom/dont-be-so-negative
Ordered turfs quickfix
2017-12-11 16:14:41 -02:00
ninjanomnom bef7ed41d3 nothing happened 2017-12-11 13:06:34 -05:00
kevinz000 1ea831b0a9 Fixes nulls (#33440) 2017-12-11 12:30:13 -05:00
FrozenGuy5 0429c45b87 Corrects the icon_state for an oxygen tank (#33443) 2017-12-11 12:29:20 -05:00
AnturK 3d813853b5 Roundend report refactor (#33246)
* Roundend report refactor

* I won't be fixining every moved part but here you go

* Preparation for feedback

* Fixup

* First draft of feedback (wip)

* Simple version of feedback for custom objectives/explanation texts

* Debug verb removal

* Fixes & show again action button

* Admin objective handling

* Fix and first step of css standarization.

* Every time

* More css

* Fix

* Fixes, abductee datum, css tweak

* Feedback and css fix

* CLIENT DETAILS DATUM + CLIENT ACTIONS + spilled css fix

* Integrates clockult badcode

* Fix

* Fix lists in assoc feedback

* Unified antagonists and teams feedbacks, bumped up antagonists version

* Adds chat link to reopen the the report

* Fixes some clockcult stuff, passes antag name to feedback

* review stuff

* fix

* Adds some missing spacing

* Roundend corners, has css gone too far.

* Spacing between same antags

* Changeling and traitor objectives now have same spacing

* Wizar report typo fix

* Wrap brother team.

* Also move it to more relevant file

* Fixes cult summon objective

* Fixes roundend report for full-round observers

* Fixes wizard with apprentices roundend report

* Tutorial scarabs don't show in roundend anymore, adds some check_ticks

* Prettier station goals

* Merges roundend delay things

* Spread the lag around

* Fixes relogin qdeling eminence

* ckey -> key
2017-12-11 11:57:20 -05:00
Jordan Brown d91055f1a1 Merge pull request #33444 from Dorsisdwarf/gloves
Changes captain glove description
2017-12-11 09:58:46 -05:00
Unknown c3d1f39c5a grammar nerds 2017-12-11 11:16:07 +00:00
ninjanomnom 9462eb18d8 check tick before onMove 2017-12-11 05:48:40 -05:00
ACCount 15d4205dc0 Fixes integrated circuit reagent components not working while in mobs, adds new helper procs (#33434)
* New IC helpers

* Fixes some reagent IC components
2017-12-10 20:37:30 -05:00
Tad Hardesty a37845a7bb Fix miscapitalized integrated HUDs prereqs (#33435) 2017-12-10 20:36:18 -05:00
FrozenGuy5 a6af32a8c5 Tweaks hardsuit's armor ratings (#33428) 2017-12-10 18:45:33 -05:00
Emmett Gaines 7848d73acc minor improvements (#33424) 2017-12-10 18:44:00 -05:00
coiax e7e33b3004 Silver slime extract foods now fry correctly (#33309)
* Silver slime extract foods now fry correctly

The invocation to create fried food wasn't correct, and was ending up
creating fried food that had the default name and description.

- Also adds a "syringe/plasma" type, because it's annoying having to
spawn in plasma sheets and grind them and then put them into a syringe,
if you want to test slime spawning stuff.

* Contains
2017-12-10 18:41:59 -05:00
uraniummeltdown 09be3e9b6b Airlock Construction Update (#33152)
* removed typetext and icontext vars from door assemblies, airlock painter no longer works on door assemblies
removed 'anchored = TRUE, state = 1' copypasta from door assemblies
door assemblies update their name more regularly during construction
added new airlock types to airlock painter on airlocks, and to the RCD
airlock assemblies built with metal are now in a list, you can build many more airlocks
vault door assemblies can be built with 4 plasteel
added a solid version of station2 airlocks, renamed to "public airlock"
glass and mineral sheets are now able to be welded out of door assemblies

* find n replace airlock/glass to airlock/glass_public in maps
door_assembly_glass to door_assembly_public

* made highsec airlocks built with 6 plasteel, removed from RCD and airlock painter
vault doors built with 8 plasteel
removed redundant vars in airlock_types.dm
reverts the dumb rglass 'replacement' addition in door assembly construction

* moved airlock assembly defines to construction defines file
fixed incorrectly named shuttle airlock glass_closed and maint panel protected closed overlays
improved examination message for glass/minerals present in assembly

* airlocks take their dir from the assembly when built from assembly
removed "vertical" variant of survival pod airlock, unneeded
survival pod airlock assembly can have glass applied
solid and glass overlays for survival pod airlocks

* OOPs some airlocks, removes a duplicate door assembly, removes some var edits on maps for a new glass type

* turn copied door assembly code into a proc
some feedback during door assembly construction
door assembly created airlock takes name from base_name if no custom name
moved plasma airlock proc to airlock_types.dm
2017-12-10 22:23:43 +01:00
oranges 40f5703f31 Merge pull request #33414 from kevinz000/DAMNIT_DEATHRIDE_WHY_WHY_WHY_IM_SALTY_REEEEEEEEEEEEE
[READY]Fixes beam rifles and flightsuits
2017-12-11 10:18:45 +13:00
Cruix 05d7402bad Allowed shuttle docking ports to be hidden from some shuttle docking computers (#33148)
Added a delay to the white ship shuttle docking computer designating a landing spot
2017-12-11 09:22:48 +13:00
oranges e5c093bc8d Merge pull request #33279 from Robustin/Reported
Standardizes false report weighting
2017-12-11 09:15:30 +13:00
oranges ea2c37c67b Merge pull request #33276 from Cyberboss/FixUplinks
Restores the uplink modules, removes LoadComponents
2017-12-11 09:14:24 +13:00
oranges 7894c38ece Merge pull request #33320 from AutomaticFrenzy/patch/component-ratings
Fix runtimes using Tweak Component Ratings on non-machines
2017-12-11 09:08:21 +13:00
ACCount 62be5943b0 Improves the way chem machines handle qdel, fixes some runtimes (#33415) 2017-12-10 14:24:42 -05:00
Anonmare d39fa67fda Fixes booze-o-mats not having booze (#33418)
* Update vending.dm

* Update vending.dm

* Update vending_items.dm

* Adds a missing close parenthisis

* I'm drunk and blind, don't sue me

* Update vending_items.dm

* Update vending_items.dm
2017-12-10 14:19:57 -05:00
jughu 6cce523c75 ha (#33391) 2017-12-10 14:03:38 -05:00
Jordan Brown 8efe53653c Fix catch all blackbox vv guard (#33400) 2017-12-10 14:02:53 -05:00
Tad Hardesty db6a058d31 Fix MULEbot id numbers showing nowhere but the alt-click menu (#33413) 2017-12-10 13:54:47 -05:00
AnturK 399d2cd6d8 Undelaying will now reboot the server normally. (#33423) 2017-12-10 13:54:20 -05:00
Jordan Brown 8a9be2d3cb INVOKE_ASYNC is the exception not the rule! 2017-12-10 12:03:42 -05:00
kevinz000 1f32d160d9 Automatic changelog compile, [ci skip] (#33393) 2017-12-10 11:58:42 -05:00
coiax 165d53b0de Add caltrop component for spikey floor objects (#33280)
* Add caltrop component for spikey floor objects

The caltrop component now can be added to any crossable atom, and it'll
act like a shard of glass, or a d4. Additional flags are possible for it
to bypass shoes or ignore people who are walking.

This means d4 don't reimplement shard logic, and also open the window
for caltrop grenades later.

Also, it taught me how components work.

* Code review I

* Caltrop damage is 4

* Cactus hurts

* Whoops

* Ignore restraints = true
2017-12-10 11:31:56 -05:00
Jordan Brown 90cf476e54 Merge pull request #33396 from AnturK/tooltip-fix
Fixes tooltip offsets
2017-12-10 11:26:40 -05:00
Unknown c82a989eaa Changes glove description 2017-12-10 14:44:42 +00:00
AnturK da6cc8ebe5 src cleanup 2017-12-10 11:07:26 +01:00
oranges 728465e7c7 Merge pull request #33392 from vuonojenmustaturska/patch-1
[s]Ghost altclick fix for pet carriers
2017-12-10 21:53:19 +13:00
kevinz000 d97b34a262 Fixes beam rifles and flightsuits 2017-12-09 19:32:31 -08:00
Jordan Brown 50a30a8f8a Merge pull request #33263 from kevinz000/patch-402
People pulling/grabbing a defib target now gets shocked harmfully when the defib goes off
2017-12-09 16:25:38 -05:00
Jordan Brown dff4c8a862 Merge pull request #33241 from swindly/suicide
Adds some suicide acts
2017-12-09 16:22:00 -05:00
Jordan Brown 1b47bb2bd4 Merge pull request #33365 from KomradeSpectre/vox_circuit
Adds AI Vox Sound Output Circuit
2017-12-09 16:18:00 -05:00
Jordan Brown 118d9605b0 Merge pull request #33376 from Xhuis/patch-3
Flickering no longer enables emergency lights
2017-12-09 16:16:40 -05:00
Jordan Brown b5ea582640 Merge pull request #33395 from Armhulen/patch-30
switches lobes for grammar n shit
2017-12-09 16:12:30 -05:00
Jordan Brown 2ee679e763 Merge pull request #33390 from duncathan/atmos-defines
cleans up atmos defines
2017-12-09 16:11:57 -05:00
Jordan Brown b6115d3686 Merge pull request #33386 from AutomaticFrenzy/patch/type-too-long
Remove meaningless "Type too long" message from VV
2017-12-09 16:10:42 -05:00
Jordan Brown 26cd6dc493 Merge pull request #33397 from Xhuis/em_light_fix
Fixes emergency lights having infinite power, and replaces their magic number with a define
2017-12-09 16:08:05 -05:00
Jordan Brown 3aac5194f8 Merge pull request #33384 from ninjanomnom/deletes-in-my-shutle-subsystem
Allows for qdel in shuttleMove procs
2017-12-09 16:07:55 -05:00
Jordan Brown 5709f90b7a Merge pull request #33389 from LuigiBoi/patch-1
Fixes spelling error
2017-12-09 16:05:47 -05:00
Jordan Brown 4d0e80b80a Merge pull request #33371 from ninjanomnom/walk-backwards-into-hell
Step backwards version of hex2num
2017-12-09 16:05:22 -05:00
XDTM a51d625536 Makes godwoken syndrome a bit more reliable (#33378) 2017-12-09 02:58:14 -05:00
oranges 07ee8d239b Add a proc to check if a weather type is affecting an area (#33373) 2017-12-09 02:36:37 -05:00
ACCount 1dd86ea128 Fixes meth explosion throwing warnings (#33356) 2017-12-09 02:09:28 -05:00
Tad Hardesty cfe23dddca Replace pAI verb tab with an action button (#33358)
pAI suicide is now standardized with other suicides. The Software
Interface verb has been changed to an action button. This eliminates the
need for a verb tab for only two verbs.
2017-12-08 23:46:05 -05:00
Kyle Spier-Swenson fdcf747e18 [ready]Timer queuing tweaks: binary sorted inserts and rolling buckets. (#33098)
* Timer queuing tweaks: binary sorted inserts and rolling buckets.

Client time timers now uses a binary search algorithm for its sorted inserts.

Processing now uses a binary sorted insert, rather then sorting it with sortTim during bucket_shifts.

Buckets now automatically wrap around rather then get regenerated every minute. (Rolling queue)

* Fixes some queue management bugs.

* Fixes a Order of Operations goof up in the ticks<->ds macros.

@ninjanomnom your pain is my success

* Remove debug line

* Fixes some binary insert bugs, fixes client time timers, moved id over to GUID

* Fixes initialization-time timers fucking everything up
2017-12-08 22:02:34 +01:00
Xhuis da9b9659c0 GOTCHA 2017-12-08 13:38:41 -05:00