Commit Graph
2035 Commits
Author SHA1 Message Date
fdd51450fd portable camera GC improvements (#20287)
* portable camera GC improvements

* Oops didn't see this

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

* Better return structure

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

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2023-01-23 23:37:55 +01:00
Coolrune206andGitHub fbd4c9c98a this time it'll work, right guys? (#20213) 2023-01-23 23:37:46 +01:00
aec7c3ff3f Reworking eyes of god to be risk / reward / from colossus (#20163)
* eye see what is happening here

* loot it and ship it

* more progress

* more progress

* eye see

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* removing extra comment to rerun checks while I think on sprite

* name / sprite, good to go™️

* BSH no longer spawns invisible penguins

* oops wrong branch

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-01-20 19:28:22 -05:00
GDNandGitHub 817664b66b adds the cluwne goblin (#20244) 2023-01-20 19:11:34 -05:00
GDNandGitHub 5413955ce2 fixes a folded mask runtime (#20246)
* fixes a folded mask runtime

* snake case
2023-01-19 17:34:06 -05:00
QwertytofortyandGitHub eae1af4c15 Body syndicate hardsuit sprites update properly (#20233) 2023-01-19 14:39:08 -05:00
Henri215andGitHub e711cd5921 Fixes lots of common spelling mistakes (#20086)
* Fixes common spelling errors: "atleast", "infront", "succesfully", "alot"

* recieve -> receive

* spelling mistakes: percieve, wierd, posession, seperate, succesful

* Spelling mistakes: noticable, concious, enviroment, existance, foward, interupted, independant

* tgui rebuild

* lets make this run

* "succeded" mispelling

* reverting money spam change
2023-01-08 20:12:31 -05:00
8ef4aa727e Adds Shadow demons (#19732)
* reshuffle

* shared base type

* moves this to the base type

* the monster

* event

* FUCK

* better sprites

* refactors bloodcrawl, more nice sprites

* review stuff

* Apply suggestions from code review

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>

* heart of darkness

* pre TM tweaks

* ARGH

* hopefully fixes double hits

* tweaks

* derp

* tweaks

* TEMP RUNTIME REMOVE LATER

* fixes

* runtime fixes

* cig runtime fix

* review + another runtime fix

* re adds sprite

* removes runtime

* oop I forgor

* DRUNK CODING

* SPRITES

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
2022-12-29 11:26:37 -06:00
AffectedArc07andGitHub e91b6c94f7 Renames QDEL_LIST to QDEL_LIST_CONTENTS (#20006)
* Renames QDEL_LIST to QDEL_LIST_CONTENTS

* derp
2022-12-29 14:28:40 +00:00
Coolrune206andGitHub 3042cfde66 Removes RnG from the Ablative Trenchcoat and Armor (#19958)
* removes RnG from the Ablative Trenchcoat and Armor

* Snowball suggestion

* don't ever let anyone tell you I'm smart

* Charlie Requests

* HAHA I AM SMART

* Hal8999 Review

* merge conflicts, who knows how they work? I don't
2022-12-28 19:02:17 +00:00
ExavereandGitHub 9caf885ae1 Matches Plasmaman Helmets to Standard Sec. Gear (#20004) 2022-12-26 13:15:57 -05:00
warriorstar-orionandGitHub a7d09cf033 Whitespace cleanup part 2. (#19891) 2022-12-24 18:38:43 +01:00
cf3f9476d8 Tape gags take longer to resist out of (#19874)
* Refactors deciseconds into seconds, tape gag resist to 30 seconds

* hal9000PR suggestion

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

* webedit formatting for the win

* Update miscellaneous.dm

* Autodoc

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

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2022-12-21 16:42:34 +00:00
McRamonandGitHub 8e71ddc71b the changes (#19834) 2022-12-07 21:09:32 -05:00
ElorgRHGandGitHub 08a9b19d19 Paradise's soul removal part 2.5: rest of security (#19522)
* Security suit resprite

* Map in security variants of riot and bulletproof armors

* Security hats resprite

* Security belt and webbing resprite

* Blue warden by default because why not

* Very tiny (literally one pixel) tweak to the HoS trenchcoat

* Security riot suit in the name

* Small armor with badge oopsie

* Vox suit and hat variants

* Species variants of new security suits and helmets

* Deconflicted

* Deconflicted again

* Forgot about the warden's beret existance

* Deconflicted suits part two

* Blueshield armor too because it would look out of place otherwise

* Deconflicted belts

* Accidental duplicate I'll fix here
2022-11-22 16:51:26 -05:00
d4744d0d8d Converts clown mask selection to a radial menu (#19675)
* converts clown mask selection to radial menu

* desc update

* Sirryan review

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>

* Sirryan review pt2

* Reverting as it no longer builds

* Revert "Reverting as it no longer builds"

This reverts commit 56873c79b1.

* right everything should work now haha

* removed else, thanks Contra

* Sirryan request

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
2022-11-21 22:53:15 -06:00
615ae2db4e Adds wedding/costume/bloody armor crates and other tweaks (#19231)
* adds wedding/costume crate and crates tweaks

* salmon suit was a mistake

* lowered armor cost and added monkey costume

* Update code/datums/supplypacks.dm

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>

* forgot to include the hood

* deconflict part 2

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
2022-11-21 22:43:54 -06:00
ElorgRHGandGitHub 8040e60736 Rejoice for the mankini has sprites again and drask can no longer be nazis! (#19609)
* Rejoice for the the mankini has sprites again

* Cleans up and denazifies drask costumes file
2022-11-21 22:14:56 -06:00
cbdbf60f57 Makes the pet collar not an accessory. Remake remake of the revert of the revert. (#19644)
* let's try this again

* who even named these variables

* Sirryan review

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>

* removes as mob

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2022-11-17 17:31:51 +00:00
Henri215andGitHub 5782866a00 balaclava can toggle again (#19671) 2022-11-12 08:54:03 +01:00
ElorgRHGandGitHub 6a9f223fda Paradise's soul removal part 6: Syndicate turtlenecks (#19594)
* Syndicate under/turtleneck resprite, combat uniform sprites

* Vox variants
2022-11-11 20:13:31 +01:00
S34NandGitHub 667dd5d4ac 515 Compatibility (#19636)
* 515 compat

* double spaces

* Callback documentation, aa review

* spacing

* NAMEOF_STATIC

* big beta
2022-11-08 23:08:40 +00:00
FloFluoroandGitHub 332fc9193a Fixes description grammar in a few places (#19607)
* Fixes punctuation on clown box description

* Fixes grammar in a couple places
2022-11-06 10:43:20 +00:00
7592bc64ce Power gloves deal stamina damage instead of weakening. (#19508)
* No more weaken + Better description

* Better attack log

* Now also throws people

* Lower cooldown on request

* Commit farie's review

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

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2022-11-05 13:45:37 +00:00
66e893ad2d Adds Suspicious Bomber Jacket (#19545)
* syndicatebomber

* armourmeup

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

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
2022-11-03 18:01:31 +00:00
Stokes52andGitHub 938f04d406 Add buttoned and unbuttoned sprites for trenchcoat (#19491) 2022-11-02 21:01:58 +01:00
ElorgRHGandGitHub e63526cfdd Paradise's soul removal part four and five: jumpsuits and caps resprite simple as (#19424)
* New jumpsuits

* ... and new softcaps

* New colors for jumpsuits

* New colors for onmob softcaps

* "New" softcap obj sprites

* Un-mirrors the N

* Swaps the green and lightgreen obj sprites around, oops

* Deconflict

* Tweaks obj sprites for softcaps a bit

* New softcaps for corgis
2022-11-02 20:26:39 +01:00
ElorgRHGandGitHub de9f949994 [GBP NO UPDATE] Restricts some jumpsuits from appearing with chameleon gear (#19472)
* Restricts some jumpsuits from appearing with chameleon gear

* This is not actually a basetype that shouldn't be seen in game
2022-10-28 20:21:21 +02:00
Vi3triceandGitHub 03ce2920e1 Defining Part 4 - Code cleanup toward defines (... and the rest) (#19388)
* I wasn't done

* nits
2022-10-28 19:28:23 +02:00
ElorgRHGandGitHub 890d4755fe Paradise's soul removal part two of many: security jumpsuits (#19333)
* A small rejuvenation of security jumpsuits

* sec formal rolling fix

* New Vox security sprites

* adjusts the warden's formal suit obj a bit

* Different style of corp skirt

* Vox adjusted to new skirts

* New sec shirt skirt

* Grey sprites

* Drask sprites

* New sec shirt and sec shirt skirt sprites

sec shirt skirt my beloved

* Merge remote-tracking branch 'upstream/master' into riots-in-the-streets-security-jumpsuit-resprite
2022-10-26 00:07:36 +01:00
BiancaWilksonandGitHub 2c65e0901c Fixes an exploit with the power gloves (#19502) 2022-10-24 21:48:42 +01:00
Bm0nandGitHub ccaa3ef34b Allows guns and other security stuff to be suit slotted on the ablative trench coat (#19458)
* why did i forget this

* spacing

* a single space
2022-10-23 16:38:10 -05:00
ElorgRHGandGitHub 574b012505 The (formal CC) blueshield drip is back in town (#19425) 2022-10-23 11:34:45 -05:00
ElorgRHGandGitHub 1660182d19 Paradise's soul removal part three: lawyers (#19376)
* Better Call Coderspriters

* This name looks better

* Turns out this is not a copy of an existing jumpsuit

* Minor drask sprite adjustment
2022-10-21 20:36:36 +02:00
PacifistDalekandGitHub 9aacf9fead New pumpkinhat and blumpkin hat sprites (#19429) 2022-10-20 20:35:28 +01:00
Vi3triceandGitHub 59dfdba201 Everything else through the door (#19358) 2022-10-13 21:56:58 +02:00
Vi3triceandGitHub 20c437f7d2 linters do your magic (#19263) 2022-10-10 20:58:41 +02:00
ElorgRHGandGitHub e843567671 Clothing (jumpsuit) DMI split, unused jumpsuit sprite purge along the way (#19092)
* Medical and RnD DMI files split

* Cargo DMI split

* Security DMI split

* Engineering DMI split

* Captain DMI split

* Civilian/service DMI split

This one hurt

* Forgot about this one

* Color DMI split

* Purges everything that was delted up until this point

... with a blindfold and a shotgun

* Dress and suit DMI split

* Pants and shorts DMI split

and merges pants and shorts files... shorts are pants, right?

* Donator/fluff jumpsuit clothing organisational relocation

* e

oops

* So this is used, repath bad

* Random commit

* Costumes DMI split and jumpsuits purge

* Some fixes

* pennywise

* Centcom DMI split

* SolGov DMI split

* Retro DMI split

* Syndicate DMI split

* Misc DMI split

* centcom officer

* Kills off uniform.dmi completely

* last fixes

* lastest fixes

* vox navy gold conflict

* civilian barber

* Tourist observers work now

* Hopefully working non-human humanoid clothing

* This being in suit.dmi is one of the reasons I made this PR

* This shouldn't be here

* Late night coding

* Pun Pun regains his drip

* Last fixes

* security/OFFICER

* Most important - clown fix

* working subtypes good

* Fixes chameleon jumpsuit

* Proper QM pathes

* Fixes jumpsuit rolling with the power of poor quality code

* Cargo tech character setup fix

* else instead

why didn't I do this in the first place

* PURP

* Fixes broken character setup job clothing

* CC suit fix

* Psychedelic jumpsuit proper path

* You must wear the jumpsuit to adjust it
2022-10-09 14:24:10 +01:00
ContrabangandGitHub 8418997ed8 Moves most screwdriver checks to screwdriver_act (#19024)
* screwdriver_act my beloved

* convert to returns instead of . / lewcc review

* it will be done

* i'm a little bit stupid, but now time to test

* sometimes I get excited and press the commit

* The great test has been completed

* oh wow oh wow, lewc review

* found one last one

* Steel review

* Lewc review

* quick sirryan review

* removes stupid comments (old coders I blame)

* sirryan review two

* whoops...

* hal review

* the fix to the fix to the fix

* Revert "the fix to the fix to the fix"

FUCK I pushed to the wrong branch
This reverts commit a96fe98781.
2022-10-06 09:30:33 +01:00
Henri215andGitHub 91ca64c465 fix collectable welding helmet (#19155) 2022-09-29 20:42:39 +01:00
QwertytofortyandGitHub 51d7989e6f might as well JUMP! (#19088) 2022-09-25 17:35:10 +01:00
33f7c1ef47 Adds an NNO-specific gas mask, the "nanotrasen navy officer gas mask". (#19081)
* Adds an NNO-only gas mask

* Adds tajaran, unathi, vulp masks

* Replaces strip_delay with seconds

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

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2022-09-25 17:32:32 +01:00
34927f05ab Wryn removal v2 (#19112)
* Removes Wryn

* and the sprites

* Fixes

Co-authored-by: Fox McCloud <Fox-McCloud@users.noreply.github.com>
2022-09-24 12:53:34 +01:00
ChristasmurfandGitHub 67481115fc alloweditems (#19102) 2022-09-20 13:26:50 +01:00
ElorgRHGandGitHub e4e06f2759 Paradise's soul removal part one of many: Captain's drip and resprite (#18891)
* The sprites and stuff

* Vox re-add

* Why did I do this

* Last tweaks

* Pixel differences

* I have decided that captains need a beret

* I have decided that Ian needs drip too

* This exists sadly

* I forgor the gloves 💀

* CONFLICTSSSSSS

* "empty" commit

* White tunic

I don't get the appeal still

* bluE

* Painful

This will most likely get closed anyway so whatever

* OLD TUNICCCCCCCCC

* Conflicts

* Loadout captain's berets

* More conflicts, yay
2022-09-17 11:13:58 +01:00
ContrabangandGitHub e52330c553 Forensic gloves now have their own worn sprite (#18987)
* wow cool gloves

* gloves.dmi
2022-09-12 22:26:48 +01:00
Bm0nandGitHub fb089794e7 Remakes PR #17569, gives all special armours full body coverage (#18911)
* IT'S BACK

* merge conflict

* very slight change on the vox sprite

* accounts for the armour refactor

* deconflict?

* ok lets not conflict

* ablative trenchco

* garment bag
2022-09-07 18:34:30 +01:00
ChristasmurfandGitHub 8a47325d33 Cargo/Mining bomber jackets, minor tweaks to allowed items in cargo wintercoats (#18914)
* cargo and mining bombers and stuff

* changes requested

* reorder loadout
2022-09-07 13:37:15 +01:00
b1be1b5a36 Ports TG berserker armor from TG to replace champion hardsuit. (#18854)
* NT does not recommend punching fauna to death

* need x2, don't want reflection

* Armor -> brute burn resist, speed removed

* phys not species

* light em up

* Apply suggestions from code review

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* a hex on you

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

* spacing, bolding, only stamina

* Apply suggestions from code review

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

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2022-09-06 00:05:36 +01:00
ElorgRHGandGitHub a2aaad2166 Gray black gloves and crappy shine on jackboots begone (#18909) 2022-09-04 17:20:12 +01:00