cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-20 10:37:17 +01:00
Code Issues Packages Projects Releases Wiki Activity
63,724 Commits 17 Branches 2 Tags
dependabot/github_actions/actions/setup-python-7.0.0
Commit Graph
2457 Commits
Author SHA1 Message Date
Leanfrog a3eee4b6cb Armor + Loadout 2021-06-06 13:01:47 -04:00
Dragonkiller93GitHubSabreML
 		a8608ccee1 Stethoscope now checks whether the target is dead. (#16062) 
* Stethoscope now checks whether the target is dead.

* Update code/modules/clothing/under/accessories/accessory.dm

Removes unnecessary parentheses.

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

Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
 2021-05-29 21:17:25 +01:00
SabreMLGitHubSean Williams
 		4960f5440c Various Tweaks & Fixes (#15857) 
* Stuff

* Grammar reviewer review

Co-authored-by: Sean Williams <12197162+S34NW@users.noreply.github.com>

* Shuttle call HTML fix

And multiline announcements too, à la #15645.

The clean_input() was causing the message to be encoded twice, and only decoded once. Removing it still encodes the string.

* Loadout revert

Co-authored-by: Sean Williams <12197162+S34NW@users.noreply.github.com>
 2021-05-24 16:29:07 +01:00
Onyxarias 10fd2da8c8 Removed taj racial restrictions. 2021-05-19 09:11:53 -07:00
Onyxarias 7ee3b8548c Flashproofs sleek, adds species restrictions to others. 2021-05-17 15:20:58 -07:00
S34NandGitHub ae6f6148c2 Solgov tweaks (#15896) 
* marines, solgov, and more!

* belts are belts

* forgot da hat

* swapped guns around, loadout hat no longer strong

* Update code/datums/outfits/outfit_admin.dm

* updated shading on uniforms

* yeets a null entry

* gas masks, flipped caps

* renamed gas masks

* merge conflicts

* dmi conflicts confuse me

* ARG mag update
 2021-05-16 11:38:16 +01:00
Fox McCloudandGitHub f76efc8f73 Merge pull request #15863 from ppi13/look-maa-i-can-fit-8-crayons-up-my-nose 
Adds the Elusive Black crayon
 2021-05-15 10:31:22 -04:00
DennisandGitHub b151dfb0b9 Fixed a grammar mistake in the coroners cap description. (#15897) 
* Fixed grammar mistake.

* fix stupidity
 2021-04-17 13:48:17 +01:00
ppi13 b97fedf863 Adds the Elusive Black crayon 2021-04-10 02:17:01 +02:00
SabreMLandGitHub da47c96e4f Prescription (#15827) 2021-04-06 13:57:19 +01:00
IonwardandGitHub 9f70667f9d Adds missing Vox sprites for Leather Overcoats and Retro Spacesuit (#15831) 
* adds missing Vox sprites for Leather Overcoats and the retro spacesuit

* made retro space suit actually use the vox specific sprite and made slight color adjustments
 2021-04-06 13:55:56 +01:00
warriorstar-orionandGitHub ea38c69633 Support 28 additional hats for corgis. (#15669) 
- /obj/item/clothing/head/HoS
- /obj/item/clothing/head/HoS/beret
- /obj/item/clothing/head/beret/sec
- /obj/item/clothing/head/bowlerhat
- /obj/item/clothing/head/caphat/parade
- /obj/item/clothing/head/hardhat/dblue
- /obj/item/clothing/head/hardhat/orange
- /obj/item/clothing/head/hardhat/red
- /obj/item/clothing/head/helmet/roman
- /obj/item/clothing/head/justice_wig
- /obj/item/clothing/head/soft/black
- /obj/item/clothing/head/soft/blue
- /obj/item/clothing/head/soft/green
- /obj/item/clothing/head/soft/grey
- /obj/item/clothing/head/soft/mime
- /obj/item/clothing/head/soft/purple
- /obj/item/clothing/head/soft/rainbow
- /obj/item/clothing/head/soft/red
- /obj/item/clothing/head/soft/sec
- /obj/item/clothing/head/soft/yellow
- /obj/item/clothing/head/surgery/black
- /obj/item/clothing/head/surgery/blue
- /obj/item/clothing/head/surgery/green
- /obj/item/clothing/head/surgery/purple
- /obj/item/clothing/head/wizard/black
- /obj/item/clothing/head/wizard/magus
- /obj/item/clothing/head/wizard/marisa
- /obj/item/reagent_containers/glass/bucket
 2021-04-05 17:44:51 +01:00
LordShekelsteinGitHubSteelSlayer
 		dc08268e67 Fixes Gloves of the North Star exploit. (#15762) 
* Fixes Gloves of the North Star exploit.

* Update miscellaneous.dm

* Update miscellaneous.dm

* Create miscellaneous.dm

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

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

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

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2021-03-31 19:37:58 +01:00
E-MonaRhgandGitHub 6d06dc97a4 Clothing grammar tweaks and the such (#15761) 
* Clothing grammar and the such

* Made the PR more \improper and other stuff

* Suggested stuff

* Removed 's where it made sense

There are more most likely
 2021-03-30 12:27:55 +01:00
QwertytofortyGitHubSabreMLAffectedArc07
 		2e4e0d2e91 Adds reactive teleport armor construction, ports repulsive armor from TG (#15343) 
* Adds reactive teleport armor construction, ports stuff from tg to do it

* Adds description to what disabled does in code

* Fixes ashwalker tendril anomaly

* SaberML code suggestions

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

* True or false

* Keeps reactive armors from triggering from kisses

* removes stun check

* oops

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-03-30 11:55:31 +01:00
hal9000PRandGitHub f6630ed529 inconsistancies go brrrr (#15680) 2021-03-20 18:31:00 +00:00
AffectedArc07 f2770ed6be Merge remote-tracking branch 'ParadiseSS13/master' into brutal-part1 2021-03-11 18:41:17 +00:00
QwertytofortyGitHubSteelSlayer
 		baca3707ea Adds the RD hardsuit from TG, removes war crimes (#15646) 
* let the pain begin

* Finishes drask sprites

* Apply suggestions from code review

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Grey, pixel fixes, steel fixes

* Skrell, taj, all that fun

* Skrek vulp, all my kin hate vulp

* nevermind vox are the worst, also adds unathi, and removes even more warcrimes ™️

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2021-03-07 18:05:41 +00:00
E-MonaRhg 63a904c190 Buffs to gamma armory v2 2021-03-02 15:47:39 +01:00
Fox McCloudandGitHub 7be1416ef0 Footstep Sound Overhaul (#15628) 
* Footstep Sound Overhaul

* remove these

* tweaks
 2021-03-02 10:01:57 +00:00
Fox McCloudandGitHub f65c8994ce Broad TG Sound Update (#15608) 
* Broad TG Sound Update

* jester update
 2021-02-27 11:59:33 +00:00
Fox McCloudandGitHub 20485c029b Pickup and Dropped Bugfixing (#15575) 2021-02-24 19:23:31 +00:00
Fox McCloudandGitHub efa3aecb61 Ports TG Pickup, Equip, and Drop Sounds (#15572) 
* Ports TG Pickup, Equip, and Drop Sounds

* really
 2021-02-24 12:51:59 +00:00
Fox McCloudandGitHub 02b9445b9b Refactors DNA Mutations; Refactors Mutations to use Traits (#15483) 
* Refactors Mutations

* traits

* more work

* styling fix

* yet even more work

* oh hush

* almost there

* it continues yet further

* and that's genetics done

* and that's it folks

* last bit and golem fixup

* oof

* oops

* tweaks and fixes

* styling
 2021-02-21 21:25:19 +00:00
SabreMLandGitHub c4b1c724aa Hardsuit hair (#15498) 2021-02-10 21:33:48 +00:00
AffectedArc07 f5f97882cf BRUTAL Part 1 - No proc var/ in procs 2021-02-01 14:10:08 +00:00
Fox McCloudandGitHub 82f1d2ce59 Improves Geiger Counters; Allows Toggle (#15366) 
* Improves Geiger Counters; Allows Toggle

* no arg

* spelling

* tweaks
 2021-01-30 23:22:21 +00:00
Fox McCloudandGitHub 003a1f7cba Tank Refactor; Breathing Retool (#15371) 
* Tank Refactor Breathing Retool

* missed maps and doc

* just in case
 2021-01-28 20:57:37 +00:00
Fox McCloudandGitHub de795c4e31 Radiation Refactor (#15331) 
* First Commit

* visible radiation and engine goggles

* correction

* t-ray fix

* further adjustments and fixups

* gieger addition and cleaning fixup

* yet more fixes

* styling fixes

* fixes

* human glowing fix

* do the merge conflict avoidance dance

* Update supermatter.dm

* supermatter rads

* mapping in

* radiation doors

* yeah yeah line endings

* clean up

* styling issues

* showers
 2021-01-24 22:03:13 +00:00
FreeStylaLTandGitHub 573520fc1e Changes HoS outfit and adds an assistant outfit for Plasmamen (#15316) 2021-01-24 13:36:54 +00:00
dearmochiandGitHub 0783f87ce2 Fix equipping welding helmet hiding mask slot (#15327) 2021-01-21 21:01:18 +00:00
Fox McCloudandGitHub 2c4733f8bc Revert "Removes ability to put collars on jumpsuits (#15155)" (#15169) 
This reverts commit df1f548198.
 2020-12-28 18:43:32 +00:00
AffectedArc07andGitHub df1f548198 Removes ability to put collars on jumpsuits (#15155) 
* Removes ability to put collars on jumpsuits

* Mochi tweaks
 2020-12-20 18:02:38 -05:00
AffectedArc07andGitHub 8cb3571a9c Revert "Stamp People (#14628)" (#15125) 
This reverts commit ad891d8e98.
 2020-12-16 16:01:04 -05:00
KugamoandGitHub ad891d8e98 Stamp People (#14628) 
* basic working CODE

* improve code further

* removes bingus

* fixes misplaced left foot stamps

* moves stamp mark offsetting to use params

* condenses image count, and reworks how the stamps are blended

* fixes less than ideal code

* alters badly named variable

* removes uneeded code

* removes unused variable, and more comments

* removes .len and improves examine

* Moves stamp marks to Misc layer in the human icon onion

* moves ink_marks to human, and other improvements

* reworks stamp mark desc system, and the human stamp mark images

* changes the pixels storage varaible for stamp markts to iamge from mutable_appearance (marginally faster)

* Good Improvements

* removes bad code

* updates some code comments

* reworks examine.dm code and more AUTODOC compliant
 2020-12-16 15:16:41 -05:00
Ty-OmahaandGitHub 256ecd0c16 Kidan Rebalance (#13203) 
* Kidan mineral

* kidan can wear glasses

* More hunger and tox
 2020-12-16 14:54:34 -05:00
QwertytofortyandGitHub 021523fe0c Makes the ert item storage less... special (#14987) 2020-12-16 14:08:01 -05:00
AurorabladeandGitHub 6a0ee9c3ae Update miscellaneous.dm (#15012) 2020-12-09 12:15:01 -05:00
dearmochiandGitHub 5edee29a50 [READY] Syndicate Contractors (#14605) 
* Syndicate Contractors initial PR

* Finalize initial version

DNP

Finalize initial version

* Baton now costs 6 Rep, show dead extraction penalty, fix scroll

* Reduce total TC, add zippo, balloon, icon tweaks

* Address moxian, AA and Farie

* Fix mode.txt

* oops

* Address Farie 2

* Tweak baton to work around stam crits, address SteelSlayer

* Address TM issues, TP menu

* Fix wrongly merged DME

* Tick contractor DM files again

* Remove step_y

* TC rewards always higher than preceding difficulty's reward

* Address Farie

* Remove extraction_turf from handle_target_return

* fix doc

* Merge part2

* Address AA again
 2020-12-09 12:03:23 -05:00
Sean WilliamsandGitHub e55eaa7447 Consistency with hardsuit values (#15040) 
While going to enter resist/armour values for engineering hardsuits on the wiki, I noticed the CE hardsuit has 10 less rad protection compared to its helmet.
Every other suit with 100 rad protection has this value consistent across both parts, and in fact, all hardsuit values match their helmet values apart from this one and the Singuloth armour. (That has a weaker helmet in a number of resistances.)

🆑
fix: Consistency with hardsuit values for CE hardsuit and helmet.
/🆑
 2020-12-06 22:40:33 +00:00
QwertytofortyandGitHub 8829e81ef5 Makes EMP actually usefull on reactive armor (#15023) 2020-12-05 10:33:13 +00:00
dearmochiandGitHub 6d9a5bf816 Fixes white wedding dress being named orange (#14986) 2020-11-26 09:41:15 +00:00
AffectedArc07andGitHub 27b1c4fd29 Merge pull request #14855 from moxian/hud 
Skills HUD now shows job icon, and other minor HUD improvements
 2020-11-15 09:28:43 +00:00
AffectedArc07andGitHub 435ddb992e Merge pull request #14872 from SabreML/Detective-badges 
Allows Detectives to get a holobadge from the loadout
 2020-11-15 09:26:16 +00:00
SabreML f2261c6d81 Review stuff 2020-11-14 17:22:50 +00:00
Stokes52 91be65338b Change numbers to booleans 2020-11-13 13:34:25 -08:00
SabreML 72432af131 Holobadges for the Detective 2020-11-11 19:13:54 +00:00
Stokes52 8ee879fcdb Add new leather motorcycle jacket 2020-11-11 11:06:06 -08:00
moxian 7069268be9 Minor HUD improvements 
- skills HUD now shows assigned job
- adding security/medical comments works
- employment records no longer span five screens, and are trimmed
instead.
 2020-11-09 06:07:20 +00:00
E-MonaRhgandGitHub 68afb726b3 CC clothing armor buff + description and name changes (#14803) 
* CC clothing armor buff + description and name changes

* Small change in blueshield's uniform description

* NTR's hat name and description change

* Fixed spacing issues with "energy"
 2020-11-07 16:51:13 -05:00