Commit Graph

23992 Commits

Author SHA1 Message Date
S34N
073cbcf944 Apply suggestions from code review
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
2021-08-14 18:01:10 +01:00
E-MonaRhg
101551865f Merge remote-tracking branch 'upstream/master' into just-defibrillator-things 2021-08-14 17:42:06 +02:00
variableundefined
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
variableundefined
40141c020a Merge pull request #16493 from matttheficus/slap_cqc
Removes Cling/Vamp CQC
2021-08-14 11:03:40 -04:00
variableundefined
5eb9a84d11 Merge pull request #16514 from Qwertytoforty/Exchanging-positions
Makes heat exchangers not dense
2021-08-14 11:01:08 -04:00
AffectedArc07
2c613b3a56 Admin message 2021-08-14 14:36:34 +01:00
variableundefined
aa820ab123 Merge pull request #16291 from SabreML/brass
Craftable brass sheets
2021-08-13 23:40:03 -04:00
matttheficus
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
AffectedArc07
42ebe326a6 Replaces panic bunker with queue server 2021-08-13 22:24:25 +01:00
Matt
578eda4fae Update code/modules/projectiles/guns/projectile/toy.dm
Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com>
2021-08-13 10:54:36 -07:00
E-MonaRhg
c895e47ccb Merge remote-tracking branch 'upstream/master' into departmental-clothing-vendors 2021-08-13 19:26:44 +02:00
AffectedArc07
1f9994d1d7 Hotfix - New characters dont save 2021-08-13 14:06:50 +01:00
theo-3
230a0c4425 I missed an outdated comment... sorry about taht 2021-08-13 12:27:15 +03:00
theo-3
6a42cf2d3d Refactor checks
Less nesting is good
2021-08-13 12:14:01 +03:00
theo-3
3da97c06c9 Better feedback for variant renaming
Initialize variant to null, so the prev check doesn't mess up the first time
Add removal message to modder "remove" for consistency
No message if variant was not changed
2021-08-13 11:44:13 +03:00
theo-3
abeb522e58 Fix remote renaming with gene modder
Also improve comments, the null check thing could confuse people
Is sanitization even supposed to break nulls???
2021-08-13 11:24:03 +03:00
chafla
0f0a18c6c7 Set holster default to false 2021-08-12 14:42:36 -07:00
chafla
3876f5b8fc Ensure revolvers are holsterable, with exceptions
Makes base revolver datum holsterable
Excludes grenade launchers, advanced mimery
2021-08-12 13:47:14 -07: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
matttheficus
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
theo-3
d0e8dfd69a Mispelled =, whoops 2021-08-12 15:48:56 +03:00
theo-3
8a8b7b16a6 Use null instead of empty string, fix all string checks 2021-08-12 15:45:36 +03:00
SabreML
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
AffectedArc07
fde941b057 Fixes this 2021-08-12 13:25:13 +01:00
AffectedArc07
1fa6186946 Merge remote-tracking branch 'ParadiseSS13/master' into client-data-loading 2021-08-12 13:24:13 +01:00
Mitchs98
7aa225ec69 No more pull cheese (#16460) 2021-08-12 13:18:00 +01:00
SteelSlayer
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
SabreML
ab4efc9705 Byond build version logging for clients (#16462)
* Client minor version logging

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

* more bad blue
2021-08-12 13:09:54 +01:00
chafla
138f71b286 Fix typo in enforcer desc while we're at it 2021-08-11 18:19:57 -07:00
chafla
d93089cf52 Make foam pistols able to be holstered 2021-08-11 18:18:30 -07:00
S34NW
b42da655f6 of course the ID computer does its own thing 2021-08-12 00:07:16 +01:00
S34NW
6234346ff0 Revert "Revert "Adds glass floors" (#16524)"
This reverts commit 517f5e8304.
2021-08-11 21:29:00 +01:00
variableundefined
517f5e8304 Revert "Adds glass floors" (#16524) 2021-08-11 21:18:49 +01:00
variableundefined
d8bfbe307a Merge pull request #15929 from S34NW/tgglassfloors
Adds glass floors
2021-08-11 16:08:09 -04:00
variableundefined
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
variableundefined
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
variableundefined
daa4adbb64 Merge pull request #16151 from S34NW/solgov_ERT
SolGov SOO loadout, SolGov hardsuits.
2021-08-11 15:55:18 -04:00
AffectedArc07
ead4ca1324 Fixes world/Topic spam limiting (#16494) 2021-08-11 15:37:37 -04:00
SabreML
c957a6c214 Colourblind colour flash 2021-08-11 15:52:23 +01:00
SabreML
6897883c33 Mime growling 2021-08-11 15:52:23 +01:00
SabreML
c35a72b3ba Blob and Revenant orbit menu 2021-08-11 15:52:23 +01:00
SabreML
47e2d483f5 Package wrapper teleporting 2021-08-11 15:52:22 +01:00
SabreML
d0b2b9333a Gibber deconstruction
`component_parts` needs a refactor at some point, since they're all listed on the circuit already.
2021-08-11 15:52:22 +01:00
SabreML
33cfd1b931 No ants on wrapped vending food 2021-08-11 15:52:22 +01:00
SabreML
7709414a74 No clicking yourself to put out fires 2021-08-11 15:52:22 +01:00
SabreML
442f19019a 'APC Access ID' sprite 2021-08-11 15:52:21 +01:00
Qwertytoforty
f688a9c689 Makes heat exchangers not dense 2021-08-10 18:26:13 -04:00