Commit Graph
2457 Commits
Author SHA1 Message Date
Stokes52 03013e5945 Add a generic proc for changing speech verb when wearking a mask 2021-09-19 07:42:56 -07:00
Stokes52 6c3675ad0c Add voice modulator mask for crafting and traitor uplink 2021-09-19 07:42:21 -07:00
variableundefinedandGitHub fa3fa1dc6a Merge pull request #16579 from FlattestGuitar/armor-defines
Adds defines for damage flags
2021-09-17 22:10:20 -05:00
E-MonaRhg a99fc879df Merge remote-tracking branch 'upstream/master' into departmental-clothing-vendors 2021-09-06 19:32:39 +02:00
variableundefinedandGitHub 188496c678 Merge pull request #16595 from SabreML/clothing-migration
[IDB IGNORE] Clothing .dmi file organisation
2021-09-01 19:44:59 -05:00
422e033d59 Adds 3 new names when a hardhat is put on a corgi (#16553)
* Hardhats

* Fixes relative path

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2021-08-25 15:57:16 +01:00
SabreML 6648d3131f Clothing Organisation V1 2021-08-24 18:37:48 +01:00
00dedfe6a9 Swiftly sanction Sabre's systematic suggestions
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
2021-08-21 12:57:24 +02:00
Mieszko Jedrzejczak 559fa37756 add defines for damage flags 2021-08-20 21:09:21 +02:00
Fox McCloudandGitHub 5af76d92cc Merge pull request #16498 from shmabuu/Fake-Blindfold
Adds Fake Blindfold
2021-08-18 16:02:42 -04:00
E-MonaRhg 566b246a24 Merge remote-tracking branch 'upstream/master' into departmental-clothing-vendors 2021-08-16 21:32:35 +02: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
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
E-MonaRhg c895e47ccb Merge remote-tracking branch 'upstream/master' into departmental-clothing-vendors 2021-08-13 19:26:44 +02:00
MattandGitHub 68b4faf763 Merge branch 'master' into ghost-rad-hud 2021-08-10 11:14:35 -07:00
40fca69f79 Update code/modules/clothing/glasses/glasses.dm
Not sure how the description got removed, strange.

Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
2021-08-10 01:33:53 -07:00
shmabuu 0749f51a82 update vampire_powers.dm and glasses.dm 2021-08-07 20:38:32 -07:00
shmabuu 61330ef44a i do be seeing part 2 2021-08-07 01:36:50 -07:00
E-MonaRhg 37f1b336b4 Makes the SecDrobe work properly by renaming a jumpsuit 2021-08-06 22:34:55 +02:00
S34NW fa88d21ae4 Merge branch 'master' into solgov_ERT 2021-08-06 15:47:40 +01:00
E-MonaRhg fc1ce6c2b2 Renames the medical scrubs and surgical caps too 2021-08-06 15:06:01 +02:00
E-MonaRhg ecd50aaf71 Suggested stuff + security bomber jacket and renamed hard hats 2021-08-06 14:50:11 +02:00
DenizandGitHub 63573dd060 Trenchoat-->trenchcoat (#16448)
Fixed trenchoat mispelling to trenchcoat
2021-07-28 19:14:58 -04:00
LiberatedWaveMan e9c0a7ddb9 Fixes Holster Logic
Apparently if a gun is holstered, cryo just automatically deletes it- this should fix that according to Sabre
2021-07-26 15:37:41 -04:00
Fox McCloudandGitHub 5ae91985c6 Merge pull request #16046 from Onyxarias/Veiltime
Tajaran Sleek Veil Flashproofing
2021-07-26 15:33:45 -04:00
SabreMLandGitHub 2c0ae9c500 Refactors the 'Examine' status tab (#16330)
* Removes the 'Examine' tab

* Revert "Removes the 'Examine' tab"

This reverts commit 0dd01722c9.

* Initial system and misc items

* Atmospherics

* Engineering

* Medical

* Mobs

* Stacks

* Structures

* Turfs & Weapons

* Final stuff and bad documentation

* Sheer laziness
2021-07-26 18:11:57 +01:00
warior4356andGitHub c7f4c82dfe Balaclava bug fix and sprite tweak (#16341) 2021-07-26 18:10:00 +01:00
Onyxarias d7a313791a Replaces "flash_protect = 1" with the proper define
Replaces "flash_protect = 1" with the proper define
2021-07-25 07:23:14 -07:00
variableundefinedandGitHub 53f489d766 Merge pull request #16132 from Leanfrog/Sec-Bomber-Jacket-Armor-+-Loadout
Standardizes Sec Bomber Jacket Armor And Adds To Loadout
2021-07-25 09:15:08 -04:00
hal9000PRandGitHub c5e593b2bf fix (#16388) 2021-07-19 00:33:23 +01:00
MattandGitHub 3369af2738 Merge branch 'master' into ghost-rad-hud 2021-07-13 15:23:23 -07:00
S34NW 59938c00e5 Merge branch 'master' into solgov_ERT 2021-07-10 15:43:33 +01:00
SabreMLandGitHub b9a4929235 'Fit Viewport' & Scoreboard refactor (#16294)
* Fit Viewport V1

* Scoreboard

* Moderate scoreboard refactor

Mostly just removing the global variables, since Mochi has plans for a proper big scoreboard refactor in the future.
2021-07-09 11:18:05 +01:00
E-MonaRhg 526187fc7b Merge remote-tracking branch 'upstream/master' into gamma_armory_buff_v2 2021-07-08 23:43:41 +02:00
QwertytofortyandGitHub 6121d42776 Makes chameleon belt have the same name / desc as a tool belt (#16290) 2021-07-03 11:23:29 +01:00
chafla 000b89a604 More review fixes
* Move start/stop processing for rad view into verb
* Move rad view proc into mob.dm
* Remove extraneous check on view range
2021-06-29 10:02:00 -07:00
1e9ed4c648 Let's labcoats store cyborg analyzers. (#16246)
* Update labcoat.dm

* Update code/modules/clothing/suits/labcoat.dm

Co-authored-by: hal9000PR <69320440+hal9000PR@users.noreply.github.com>

Co-authored-by: meow20 <meow20@onet.pl>
Co-authored-by: hal9000PR <69320440+hal9000PR@users.noreply.github.com>
2021-06-29 11:34:26 +01:00
chafla c9e796da8d Address code review 2021-06-29 01:01:49 -07:00
chafla d98ca95ff1 Restore limits on range 2021-06-25 14:41:16 -07:00
chafla 7c6be50505 Create new mob proc to show radiation, add to verb 2021-06-25 14:29:58 -07:00
S34NandGitHub 7c6e19850a Merge branch 'master' into solgov_ERT 2021-06-22 10:37:32 +01:00
SabreMLandGitHub 0b375de42c Removes the the vast majority of 'The the' from the the code (#15597)
* The the

* Some more

* Review 1

* A couple more
2021-06-20 10:20:32 -04:00
266e7c2dbf Prevents ablative armor from reflecting in hand (#16204)
* Prevents ablative armor from reflecting in hand

* Update code/modules/clothing/suits/armor.dm

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

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2021-06-18 21:15:12 +01:00
hal9000PRandGitHub 85be09d7ce Refactors and tweaks reactive armours (#16086)
* changes things

* Review

* better way of doing this.
2021-06-17 10:33:39 +01:00
S34NW 46bb8d448f damage resist tweaks 2021-06-15 13:47:17 +01:00
S34NW 277b14275d hardsuit pass 1 2021-06-15 00:55:42 +01:00
S34NW ba45742fe9 loadout update, armour tweaks 2021-06-13 16:56:57 +01:00
8448789ec6 no nits please
Co-authored-by: dearmochi <shenesis@gmail.com>
2021-06-13 09:45:32 +01:00
S34NW d5f3d55a94 Solgov is now ERT, also solgov SOO is now a thing. 2021-06-10 20:28:56 +01:00