Commit Graph
23551 Commits
Author SHA1 Message Date
S34NW 0daa8b233b use the right damn file fool 2021-08-21 17:36:05 +01:00
Fox McCloudandGitHub 3d956a2cd8 Merge pull request #16532 from dearmochi/tweak-runechat-emote-limit
Caps runechat emotes to 100 chars
2021-08-17 15:50:45 -04:00
Fox McCloudandGitHub 30fb0cfd01 Merge pull request #16549 from AffectedArc07/ssmetrics
SSmetrics - Elasticsearch powered metrics viewing
2021-08-17 14:59:11 -04:00
hal9000PRandGitHub ea50d096ac vampire runtime fix (#16551) 2021-08-16 15:24:58 +01:00
variableundefinedandGitHub 83cc3f72eb Merge pull request #16370 from LiberatedWaveMan/Cryopod-Storage-Update
Adds RCD and RPD to Cryo Storage; Fixes Cryo Storage Logic
2021-08-15 17:58:28 -04:00
variableundefinedandGitHub f647e7f17f Merge pull request #16256 from chafla/ghost-rad-hud
Enable Radiation HUD for ghosts
2021-08-15 17:07:06 -04:00
AffectedArc07 2ece3203c2 SSmetrics - Elasticsearch powered metrics viewing 2021-08-15 13:00:19 +01:00
joep van der velden 7ed779b2e4 Merge remote-tracking branch 'upstream/master' into fireflash-fixes 2021-08-15 10:14:43 +02:00
chafla 50a90d2767 Merge branch 'master' into ghost-rad-hud 2021-08-14 17:28:16 -07:00
variableundefinedandGitHub c6c84c478d Merge pull request #15652 from E-MonaRhg/gamma_armory_buff_v2
Buffs to gamma armory v2
2021-08-14 11:30:15 -04:00
variableundefinedandGitHub 40141c020a Merge pull request #16493 from matttheficus/slap_cqc
Removes Cling/Vamp CQC
2021-08-14 11:03:40 -04:00
variableundefinedandGitHub 5eb9a84d11 Merge pull request #16514 from Qwertytoforty/Exchanging-positions
Makes heat exchangers not dense
2021-08-14 11:01:08 -04:00
variableundefinedandGitHub aa820ab123 Merge pull request #16291 from SabreML/brass
Craftable brass sheets
2021-08-13 23:40:03 -04:00
7c6ad0300b Update code/modules/martial_arts/martial.dm
Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com>
2021-08-13 18:29:13 -04:00
mochi 115ddc5a5f to be continued... 2021-08-12 22:31:18 +02:00
mochi d9d4e7ad4d Caps runechat emotes to 100 chars 2021-08-12 22:15:49 +02:00
3d4163c978 Update code/modules/martial_arts/martial.dm
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2021-08-12 09:51:11 -04:00
SabreMLandGitHub 269afcae07 Adds a pointer to the extraction location for Contractor uplinks (#16497)
* Contractor extraction point locator V1

* `update_static_data()` revert
2021-08-12 13:26:58 +01:00
Mitchs98andGitHub 7aa225ec69 No more pull cheese (#16460) 2021-08-12 13:18:00 +01:00
SteelSlayerandGitHub f367714900 Admins who ghost have their Antag HUD defaulted to On (#16459)
* admin default ahud

* review tweaks
2021-08-12 13:17:44 +01:00
SabreMLandGitHub ab4efc9705 Byond build version logging for clients (#16462)
* Client minor version logging

* Player panel
2021-08-12 13:14:06 +01:00
SabreMLandGitHub 69799bc32b Central Primary Hallway contract removal (#16488) 2021-08-12 13:11:50 +01:00
matttheficusandGitHub ee1a75b5b6 Variety of Admin Alert Readability Tweaks (#16496)
* Color Swap

* more bad blue
2021-08-12 13:09:54 +01:00
S34NW b42da655f6 of course the ID computer does its own thing 2021-08-12 00:07:16 +01:00
variableundefinedandGitHub 517f5e8304 Revert "Adds glass floors" (#16524) 2021-08-11 21:18:49 +01:00
variableundefinedandGitHub d8bfbe307a Merge pull request #15929 from S34NW/tgglassfloors
Adds glass floors
2021-08-11 16:08:09 -04:00
variableundefinedandGitHub d2d2af6a14 Merge pull request #15952 from farie82/runtime-fixes-6
Fixes 4 runtimes. Linked forum account message is now shown properly
2021-08-11 16:06:57 -04:00
variableundefinedandGitHub 99e8487bfd Merge pull request #15656 from Qwertytoforty/I-guess-I-port-stuff-now-huh
Adds supermatter sliver steal and plutonium core steal objective from TG
2021-08-11 16:05:24 -04:00
variableundefinedandGitHub daa4adbb64 Merge pull request #16151 from S34NW/solgov_ERT
SolGov SOO loadout, SolGov hardsuits.
2021-08-11 15:55:18 -04:00
AffectedArc07andGitHub ead4ca1324 Fixes world/Topic spam limiting (#16494) 2021-08-11 15:37:37 -04:00
Qwertytoforty f688a9c689 Makes heat exchangers not dense 2021-08-10 18:26:13 -04:00
MattandGitHub 68b4faf763 Merge branch 'master' into ghost-rad-hud 2021-08-10 11:14:35 -07:00
S34NandGitHub f8a297b615 Fixes contractor extraction areas never being chosen due to bad names (#16484)
* box centric names begone

* Update objective_contract.dm

* Update code/modules/antagonists/traitor/contractor/datums/objective_contract.dm
2021-08-10 10:40:27 +01:00
d32e9f9bea Makes important terror spiders bold on hivemind. (#16434)
* Makes important terror spiders bold on hivemind.

* whoops

* isterrorspider, spacing, and carry over

Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>

* Changes it to a loudspeaker variable

* Update code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_spiders.dm

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2021-08-10 10:39:34 +01:00
2ba2c20a4f Allows admins to cryo cyborgs and AI's in player panel (#16418)
* Allows admins to cryo cyborgs and AI's

* Apply suggestions from code review

Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>

* More requested changes

* Better cryoing and runtiming

Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
2021-08-06 13:50:10 -04:00
matttheficus 6a8c86571a you forget the basics to CQC! 2021-08-06 13:30:04 -04:00
S34NW fa88d21ae4 Merge branch 'master' into solgov_ERT 2021-08-06 15:47:40 +01:00
9bf4d7ad84 Sets a Mob Cap for Giant Spiders (#15923)
* Counting and Capping for Giant Spider Spawning

* Moves magic numbers into defines

* Apply suggestions from code review

Co-authored-by: dearmochi <shenesis@gmail.com>

* Update code/controllers/subsystem/mobs.dm

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* makes requested changes

* I hope to god this fixes this

* implements requested changes

* removes double parent call

Co-authored-by: dearmochi <shenesis@gmail.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2021-08-05 21:23:01 +01:00
S34NW ea87e351a2 Merge branch 'master' into tgglassfloors 2021-08-05 15:17:09 +01:00
SabreMLandGitHub ab99287296 Sentience event information (#16426) 2021-08-05 11:37:57 +01:00
02fe0876f5 Fix bundle #3 (#16411)
* Explosive implant

* Package wrapper

* Venus human trap sprites

* Vine damage

* Wisp vision

* Display case

* Storage viewing

* Ghost poll nullspacing

* Inflatable barrier piercing

* Pneumatic cannon

* Cow grammar

* Centcom jaunting

* Consistency

Not actually a lazy list, as far as I can tell

* Review 1

Co-Authored-By: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Review 2

Co-Authored-By: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* length()

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2021-08-05 11:04:27 +01:00
b2aec584b5 LightFire53 Fluff Item Grammar (#16465)
* Update item_defines.dm

Makes it look less awkward upon examining while wearing items

* Update code/modules/customitems/item_defines.dm

Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>

Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
2021-08-04 21:43:16 -04:00
QwertytofortyandGitHub 9587c30d90 Makes making multiple vampires log the number (#16482) 2021-08-04 21:42:33 -04:00
SabreML bb82a58c8f Merge remote-tracking branch 'upstream/master' into brass 2021-08-04 19:32:12 +01:00
SabreMLandGitHub baf15f25a7 Fixes runtimes caused by null client preferences (#16464)
* Client check

* Skip character randomisation
2021-08-01 12:31:43 +01:00
Fox McCloudandGitHub 3befeec4ab Merge pull request #16350 from warior4356/drone-air
Adds an air analyzer to drones
2021-07-31 22:16:27 -04:00
warior4356 fecd88b228 Removes blueprints 2021-07-31 16:32:23 -07:00
SteelSlayerandGitHub 761be93029 borg recharge fixes (#16463) 2021-07-31 20:08:08 +01:00
hal9000PRandGitHub 33eaf68d42 spooky (#16461) 2021-07-31 14:50:17 +01:00
SabreMLandGitHub 6b326123ac DNR ghost spawns fix (#16458) 2021-07-30 14:57:36 +01:00