cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-21 07:42:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
58,079 Commits 26 Branches 2 Tags
82b863cefdabb64cb15e03dd7978006390c0f3be
Commit Graph

26638 Commits

Author SHA1 Message Date
matttheficus
405d794bd3 Jammers Now Prevent Tracking + Slight Range Buff (#22149) 
* this was easier than i thought frankly

* hmbgerdo review
 2023-09-07 10:53:46 +01:00
DGamerL
db1ed68a7d Tweaks some nuclear agent items (#22119) 
* First changes

* Dont forget to do cooldown shit

* I HATE PEOPLE AAAAA

* Defib almost done

* Okay we ball

* Defib done

* I hate bullets

* Sniper done

* More stamina damage

* GDN review + Oops I forgor this

* Update code/datums/components/defibrillator.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Disintegrate go brrrr

* Lewc review

* Ghhhhh

* Final oopsie fixed

* Almost made an oopsie daisy myself

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2023-09-07 10:52:48 +01:00
PopGamer46
50443325bf Adds Twimsts, a snack that can be used as eatable handcuffs (#22092) 
* adds twimsts, the eatable handcuffs

* fixes twimsts cuffs showing up as cable on examine

* missing ending newline fix

* spelling

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* list formating or something

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* removes unnecessary bit of description, why did i put that there?

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* 0 to FALSE

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* path fix

* removes note showing wrong intent of adding code

* removes unnecessary examine

* code shortening, optimization, something?

* fix

* proper proc

* oops

* better sprites

* trash sprite not eaten?

* even better sprites

* removes extra empty line of code

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* fixes improper code formatting or something

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2023-09-07 10:39:29 +01:00
DGamerL
702893d02b Deletes the space worm (#22251) 
* But every brave man wants to be wealthy

* even though it would mean losing thisgreattreasure
 2023-09-06 22:19:58 +01:00
Adrer
f781310ae5 Prevents augmenting with just any robot_parts (#22242) 
Co-authored-by: Adrer <adrermail@gmail.com>
 2023-09-06 20:01:49 +02:00
PopGamer46
516e9a6b84 Fixes a typo (#22177) 
* spelling

* removes accidentally added space

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2023-09-06 19:03:48 +02:00
Contrabang
65ab4a5d89 Refactors station areas to be /area/station subtypes (#21681) 
* areas

* progress...

* death hatred and murder

* get current master maps

* hoooly shit i can load up the maps

* it compiles now

* map changes

* fixes some unintended stuff

* make the .dme right

* fix mixed space+tab indents

* more space-tab fixes

* CI, please show me more than 1 CI fail at a time

* UPDATE PATHS!!!

* none of the stations had it anyways, but fixed

* mint wasnt actually deleted, my bad

* epic random CI fail for no reason

* i beg you, CI

* dont delete anything

* okay THAT should work now

* okay get master maps and rerun

* okay THEN run update paths

* actually done now

* oops
 2023-09-06 17:37:50 +01:00
Contrabang
07e0b4fc97 bam (#22134) 2023-09-06 12:49:42 +01:00
Qwertytoforty
5b0c5c9e95 ignore branch name should be something snarky like THERE IS NO ESCAPE (#22257) 2023-09-05 20:06:21 -05:00
StealthCT
233edad498 Add missing UpdateButtonIcon() calls (#22162) 
Some calls to UpdateButtonIcon() were missed from
https://github.com/tgstation/tgstation/pull/63836

Fixes #22161.
 2023-09-04 21:57:56 -05:00
Burzah
c5632be8d5 process flag add (#22245) 2023-09-04 15:08:40 -05:00
Burzah
8105c9fbb0 runtime fix (#22194) 2023-09-01 18:30:39 -05:00
TaM-tHe-JaM
e07d63702c Islamic Garb - My First Contribution (#22040) 
* abayacontribute

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

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

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

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

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

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

* adding a slash

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

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* NVM didnt get deleted, didnt transfer

* tab fix

* removed comma

* Deleted unnecessary list, thanks DGamerL

* deleted

* finallymergeconflictgone

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2023-09-01 23:33:44 +01:00
Qwertytoforty
d727444184 now with REAL GHOST GRABBING ACTION ™️ (#22189) 2023-09-01 23:24:52 +01:00
DGamerL
02f6530238 You can't feed simplemobs with condiment bottles anymore (#22164) 
* Idk I was very bored

* Even more bored

* Stealthii
 2023-09-01 23:22:01 +01:00
GDN
08eb183875 Gives the bartender their own version of judo (#21886) 2023-09-01 23:20:47 +01:00
Burzah
67901058ae Unum! The card game. (#22152) 
* UNUM!

* distributing unum

* merch vendor

* Apply suggestions from code review

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* color

* dmi update

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2023-09-01 23:18:37 +01:00
tristan1333
7e259e360b Traitor chef can use traitor CQC, no multiple defensive stance actions (#22113) 
* traitor chef can use CQC outside of kitchen, only 1 defence action

* moved action declaration

* Update code/modules/martial_arts/cqc.dm

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

---------

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
 2023-09-01 23:15:45 +01:00
Silverplate
6ffa3e5c11 Tweaks species specific traitor items (#22088) 
* Fixes species tot items in surplus crates

* Updates Love pen
 2023-09-01 23:14:21 +01:00
matttheficus
0c8a6a29d7 Removes Stun Arm from Safety Override, Adds Proto Emitter (#22076) 
* begone secborg 2.0

* god i hate autocomplete

* slight buff

* sean review
 2023-09-01 23:13:30 +01:00
matttheficus
0c17a3c4f7 Engineer Scanner Goggles on Radiation Mode Prevent SM Hallucinations/Singulo Staring (#22069) 
* here we go!

* singulo too

* contra review

* contra 2
 2023-09-01 23:12:17 +01:00
matttheficus
d9b2d7cf89 no more goomba stomping megafauna (#22067) 2023-09-01 23:11:21 +01:00
Christasmurf
8700b3c88f ERT Jumpsuits, DS jumpsuit resprite (#22063) 
* ertjumpsuits

* deathsquadjumpsuits
 2023-09-01 23:11:01 +01:00
Jenny
77af715a99 Allows vulp, taj and unathi to use certain hairs (#22018) 2023-09-01 23:08:26 +01:00
Luc
5935a847b8 Makes brand intelligence less specific (#22007) 
* Makes brand intelligence less specific

* Add some debug messages
 2023-09-01 23:07:59 +01:00
Henri215
bd0b8bee5f Bureaucratic error event tweaks (#21990) 
* tweaks to bureaucratic event

* line breaks

* decreasing to 2
 2023-09-01 23:06:55 +01:00
Contrabang
b99db3d3d0 Allows for easier pulling onto beds and chairs, buckling someone stops anyone currently pulling them. (#21960) 
* wham-bam

* oops
 2023-09-01 23:04:04 +01:00
HMBGERDO
42c762ccd2 Using medicine on yourself on activate (#21955) 
* now you can use patches, pills, injectors

* more supported meds

* apply proc
 2023-09-01 23:02:34 +01:00
HMBGERDO
51f138ad69 fireflash_sm is now more dangerous (#21951) 
* fireflash_sm is now more dangerous

* Update code/modules/atmospherics/environmental/LINDA_fire.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2023-09-01 23:01:43 +01:00
Henri215
e5ca69bd06 Ports some sounds for toolbox/briefcase/switch (#21938) 2023-09-01 23:00:36 +01:00
Sadhorizon
21150901d5 Kidan random name generator updates. (#21935) 
* works

* removed second krek and the healer

* tweaks

* more jobs, more names
 2023-09-01 22:59:35 +01:00
Sadhorizon
68ace6f0ef Kidan jumpsuit sprites: colored jumpsuits (#21894) 
* all the colored stuff

* ancient

* psyche

* jerseys

* tweaks to jerseys
 2023-09-01 22:53:56 +01:00
AffectedArc07
d17ebbd2a4 Reverts looping delta alert noise (#21854) 2023-09-01 22:41:55 +01:00
Qwertytoforty
8803f536b7 [READY FOR REVIEW] Lava land generation overhaul / variety (#21838) 
* she lavas on my land till I chasm?

* need this

* whoops

* qwerty you are a dumbass

* now with 12 more maps per map

* repaths mesons, advanced mesons / meson implants show chasms

* more stuff

* range not radius dipshit

* sprites yipee

* define it

* undo mesons

* removes things I missed

* Apply suggestions from code review

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* I'm lavaing it

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2023-09-01 22:40:39 +01:00
GDN
100a9d18b6 fixes a to_chat runtime, lints now throw an error if a to_chat proc lacks a target argument (#21827) 
* untested :)

* i may be stupid

* there we go
 2023-09-01 22:39:21 +01:00
Luc
df7c7fba0a Makes dchat controlled humans resist while moving (#21820) 
* makes humans resist when moving

* oops this is a list

* Moves human deadchat stuff out to its own file
 2023-09-01 22:38:48 +01:00
cybercapitalism
3f44d71ed5 removes ephedrine addiction (#21795) 2023-09-01 22:37:46 +01:00
GDN
e9acb9fde4 prevents xenos catching thrown items they can't hold (#21766) 
* prevents xenos catching thrown items they can't hold

* gogo gadget duplicate code

* trait solution
 2023-09-01 22:37:09 +01:00
matttheficus
acb7352265 Gives Vampires Stronger Night Vision at 500 Blood (#21764) 
* I SEEEEEEEEEEEEE YOU

* Hal review part 1

* its time to suck at coding

* right, i think im getting somewhere

* testing shit - doesnt work

* im finally freeeeeeeeeeeeeee

* hal review 2: electric boogaloo
 2023-09-01 22:36:40 +01:00
1080pCat
99f24119c5 yippie cyborgs and drones get them now (#21608) 2023-09-01 22:34:41 +01:00
SeizingSponge
d1dd4e60db Roburger renamed to Hamborger and new description for clarity (#21604) 
* Roburger renamed to Hamborger and new description for clarity

* Update sandwiches.dm

fixing my mistake

* Update sandwiches.dm

* Update recipes_microwave.dm

Fixed the call to roburger to be a call to hamborger
 2023-09-01 22:34:14 +01:00
Luc
327add6348 Converts two-handedness/wielding to a component (#21619) 
* initial checkin

* Add everything but maps

* update paths

* Patches some minor bugs across twohanded things

* remove a stowaway

* Update code/__DEFINES/dcs/signals.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Contra review

* Fix kc

* hopefully fix file perms

* Fix file perms

* revert line-endings

* uh?

* Trying once again to fix file formats

* henri review 1

* henri review 2

* update from master

* Removes override that breaks modsuits

* re-add reference

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2023-09-01 22:06:59 +01:00
SchrodingersWolf
de12232bda Tweaks how splints work on healthy limbs (#22080) 
* It's not painful when my legs are not broken

* Changes to_chat to owner.visible_message

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

* Spaces and right shifting be gone

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2023-09-01 22:00:06 +01:00
PopeDaveThe3th
e503a6a7e1 Malf points 10 -> 15 (#22147) 2023-09-01 21:51:48 +01:00
1080pCat
ccf9590b34 Still more forgotten (#22103) 2023-09-01 21:51:06 +01:00
Silverplate
7de34aff24 Decreases biohazard weights by roughly 25% (#22089) 
* Decreases biohazard weights by roughly 25%

* Decreases officer weights
 2023-09-01 21:50:45 +01:00
Henri215
3dd1fc7b19 Ports the salute emote sound from CM-SS13 (#22017) 
* Ports the salute emote sound from CM-SS13

* valid_shoes list

* funny shoes sounds

* Update code/modules/mob/living/carbon/human/human_emote.dm

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

* Update code/modules/mob/living/carbon/human/human_emote.dm

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2023-09-01 21:48:40 +01:00
GDN
181b9e5c02 removes the refresher crystal (#21869) 2023-09-01 21:48:20 +01:00
DGamerL
89bbd9251b [s] Speed no go brrrrr (#22171) 
* Speed no go brrrrr

* Oops

* Also this

* I forgor

* Silver told me this was intended
 2023-08-30 20:22:23 -05:00
Qwertytoforty
d76fb84454 Fixes scaling drug downsides not working. (#22170) 
* 621, go to the drug store and pick up 300 units of meth from the corporations.

* PULL BACK 621 THEY GOT EARLY RETURN SUPPORT
 2023-08-30 19:38:37 +01:00