cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-24 08:22:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,098 Commits 29 Branches 2 Tags
bdf50ea89400a5d080df567b99025b399eaeee5a
Commit Graph

264 Commits

Author SHA1 Message Date
Kugamo
630a88ab96 new variable (#18025) 2022-06-21 12:01:58 +01:00
Christasmurf
7f9cd8541b add icons and code (#17497) 
Co-authored-by: Christasmurf <2543783+Christasmurf@users.noreply.github.com>
 2022-03-21 17:09:30 +00:00
E-MonaRhg
bd2785bb17 Properly named black surgical cap (#17201) 2021-12-10 09:19:01 +01:00
variableundefined
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
variableundefined
188496c678 Merge pull request #16595 from SabreML/clothing-migration 
[IDB IGNORE] Clothing .dmi file organisation
 2021-09-01 19:44:59 -05:00
TheYeetster1
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
Mieszko Jędrzejczak
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
E-MonaRhg
c895e47ccb Merge remote-tracking branch 'upstream/master' into departmental-clothing-vendors 2021-08-13 19:26:44 +02: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
S34NW
ba45742fe9 loadout update, armour tweaks 2021-06-13 16:56:57 +01:00
S34N
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
Dennis
b151dfb0b9 Fixed a grammar mistake in the coroners cap description. (#15897) 
* Fixed grammar mistake.

* fix stupidity
 2021-04-17 13:48:17 +01:00
warriorstar-orion
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
E-MonaRhg
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
AffectedArc07
f5f97882cf BRUTAL Part 1 - No proc var/ in procs 2021-02-01 14:10:08 +00:00
dearmochi
0783f87ce2 Fix equipping welding helmet hiding mask slot (#15327) 2021-01-21 21:01:18 +00:00
E-MonaRhg
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
Stokes52
a71659496b Add new visually appealing sprites to replace the existing trenchcoat and fedora sprites (#14679) 
* Add new visually appealing sprites to replace the existing trenchcoat and fedora sprites

* Add trenchcoat for vox

* Fix rogue pixels

* Fix rogue pixels on human jacket

* Add white fedora

* Add inventory icons for each fedora

* Add hat support for vox

* fix white pixels

* Add inventory sprites for trench coats
 2020-10-24 17:08:44 -04:00
ppi13
5fae70889b Gives beanies to vox (#14644) 
* Gives beanies to vox

* Adds beaniestripedred
 2020-10-21 18:21:29 -04:00
AffectedArc07
90fd9a8fb8 Removes all relative heresy (#13969) 
Removes all relative heresy
 2020-09-16 12:52:20 -04:00
denghis1
845e7a8b75 Added the warning cone as a headpiece for Ian (#14216) 
* Added the warning cone as a headpiece for Ian
 2020-09-16 09:52:40 -04:00
ExusA
cedde91ad4 adds exceptions 2020-08-18 19:57:31 +08:00
Deelite34
e2bd916425 Fix typos 
Fixes typos in baseball cap and searching for items under seat in space pod.
 2020-07-02 23:09:40 +02:00
Aquilar
cb926d7074 thanks travis 2020-05-19 06:58:07 +08:00
Aquilar
5df41300fd some value changes 
Signed-off-by: Aquilar <20759278+Aquilar@users.noreply.github.com>
 2020-05-19 06:44:08 +08:00
Aquilar
4d61487f9b This commit changes armour values of existing sec gear and adds armour values to some of the plasmamen helmets so they in line with everything else. 
Lowers the protective values of the security beret to be line with the security cap, also removes bomb protection from both.
Lower the protective values for the security winter coat to be in line with the security security. (no more power gaming with custom load outs)
Adds armour values to the following plasmamen helmets so they not unnecessarily held back in those jobs; mining, hop, captain, security and blueshield.

Signed-off-by: Aquilar <20759278+Aquilar@users.noreply.github.com>
 2020-05-19 06:43:54 +08:00
Sgtdevel
ce9f1597f3 Update soft_caps.dm 2020-05-13 11:50:15 -04:00
Sgtdevel
dd7ea13bf6 Update soft_caps.dm 2020-05-13 11:07:33 -04:00
AffectedArc07
04ba5c1cc9 File standardisation (#13131) 
* Adds the check components

* Adds in trailing newlines

* Converts all CRLF to LF

* Post merge EOF

* Post merge line endings

* Final commit
 2020-03-17 18:08:51 -04:00
Fox McCloud
66b6cc4524 Merge pull request #12499 from Ionward/drask-oct4-medspritefix 
Drask Surgical Cap/Mask Sprite fix
 2019-10-07 23:09:46 -04:00
Ionward
63c2c00733 adds drask surgical cap and fixes incorrect path for drask surgery mask 2019-10-04 11:55:49 -07:00
Fox McCloud
238ea19d09 Merge remote-tracking branch 'upstream/master' into universal-damage 
# Conflicts:
#	code/modules/clothing/suits/labcoat.dm
#	code/modules/clothing/under/miscellaneous.dm
#	code/modules/mob/living/carbon/human/species/golem.dm
#	code/modules/mob/living/simple_animal/bot/ed209bot.dm
 2019-09-21 12:40:07 -04:00
Ionward
4b87b5b42a Oh, didn't you hear? I'm the King of the Rhumba beat. (#12339) 2019-09-20 17:58:31 -07:00
Fox McCloud
af92373d33 though-this-world-may-be-broken 2019-09-15 05:53:43 -04:00
Fox McCloud
1bfb442d40 Merge remote-tracking branch 'upstream/master' into universal-damage 2019-09-14 21:15:31 -04:00
Fox McCloud
94a2861039 Removes Real Armor from Autodrobe 2019-09-12 01:07:58 -04:00
Fox McCloud
f998cb74ad then-we-shall-reforge-the-armor-from-what-remains 2019-09-10 07:03:05 -04:00
Fox McCloud
b4863db46f further tweaks 2019-09-05 18:44:55 -04:00
Fox McCloud
dca6d98f5f Refactors Corgis 2019-09-04 18:40:34 -04:00
farie82
9d58af6ec5 Merge branch 'master' into hoodies 2019-08-30 22:57:07 +02:00
Fox McCloud
eef0bc919d Implements Tailoring 2019-08-26 17:41:39 -04:00
farie82
3b433fbce5 Merge branch 'master' into hoodies 2019-08-15 18:10:31 +02:00
Fox McCloud
52b37935f7 commit 2 2019-08-11 23:23:43 -04:00
Mark van Alphen
c9e87f6593 Add more explosive power to Syndicate base, add species specific sprites for explorer equipment (thanks Ionward), fix Drake explosive sound, clarify ash walker/syndicate base personnel flavor text 2019-06-01 21:17:17 +02:00
Mark van Alphen
acbf627f8c Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into bundles 
# Conflicts:
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/customitems/item_defines.dm
 2019-05-13 22:08:49 +02:00
Mark van Alphen
90f71f164a Remove unused species_fit and move chameleon file 2019-05-05 20:37:53 +02:00