cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-21 15:51:31 +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
Henri215
d824cfaeaf Adds false alarm event back into rotation (#20823) 2023-04-22 09:29:26 +02:00
Zelf
de74815c1e drask, grey, kidan (#20817) 2023-04-22 09:29:11 +02:00
1080pCat
d315a74ca5 Adds a funny little message if you focus too hard on a singulo/teslo (#20815) 
* tele thingy

* grammar!

* new singulo message

* clasuse guarded (and more grammar)

* grammar, indentations, removes a useless return

* Update code/modules/power/singularity/singularity.dm

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

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2023-04-22 09:29:02 +02:00
S34N
4a5fb011e6 515 Compliance part 2 (#20809) 
* more illegal procpaths

* Update code/modules/ruins/lavalandruin_code/puzzle.dm

* REGEX_REPLACE_HANDLER

* shuttle fix
 2023-04-22 09:28:54 +02:00
MisterMovie
727e3e7b53 (serious) Fixes (?) the sprite of the honk rifle (#20801) 
* Adds an old sprite for the honkrifle

* Revert "Adds an old sprite for the honkrifle"

This reverts commit 26f04dd735.

* adds an old sprite for the honk rifle
 2023-04-22 09:28:27 +02:00
Zelf
98fe72799f (serious) Resprites a majority of drinks/drink related objects + Adds Lean (#20793) 
* triple cheeseburger mcdonalds

* changing taste_desc of lean
 2023-04-22 09:28:19 +02:00
Henri215
37e9e6f359 Pimpin' ride floor buffer now can be toggled on/off v2 (#20762) 
* Pimpin' ride floor buffer now can be toggled

* Early return
 2023-04-22 09:28:11 +02:00
GDN
bc8aac8aa1 admin announcements now more obviously alert players (#20758) 2023-04-22 09:27:58 +02:00
matttheficus
e250959bc7 Tweaks Gasping and Deathgasp Range + Reduces Gasp Volume with Oxyloss (#20753) 
* -20db supressor

* garrote 7 range + wall block

* deathgasp 9 + scaling gasp volume with oxyloss

* Revert "garrote 7 range + wall block"

This reverts commit 0e9e8de5ef.

* Revert "-20db supressor"

This reverts commit f29e4558c2.
 2023-04-22 09:27:45 +02:00
ppi13
bcbce645b1 Allows human mobs to alt+click to unlock APC and Air Alarms (#20742) 
* alt+click to unlock airalarms and apc

* Update code/modules/atmospherics/machinery/airalarm.dm

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

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2023-04-22 09:18:31 +02:00
GDN
c2176e3598 makes #20471 work (#20739) 2023-04-22 09:18:17 +02:00
Henri215
d65ec2d5e8 Tweaks to greed ruin and die of fate (#20737) 
* Tweaks to greed ruin and die of fate

* Delay between effects

* moved and updaated traitor items

* More tweaks to traitor item list

* Update code/game/objects/items/weapons/dice.dm

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

* Sirryan review

* Lets decrease the money even more

* experimental KA instead of alien pistol

* emp dmg for machines when interacting

* brainloss

* Code improvment

* forcewall removal

* Turning into a list

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2023-04-22 09:18:08 +02:00
JimKil3
319046545c organ tweaks and grammar (#20732) 2023-04-22 09:17:52 +02:00
GDN
1d6235afa7 adds the mecha ion thruster (#20728) 
* adds the mecha ion thruster

* Update code/game/mecha/equipment/tools/other_tools.dm

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

* Update code/modules/research/designs/mechfabricator_designs.dm

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

* devious

* ion thruster effect

* ryans review

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2023-04-22 09:17:43 +02:00
1080pCat
deef459069 Freshens up floodlights to not be 10 years old (#20727) 
* Flood lights!

* gramma! my enemy!! (and a forgotten span)

* gramma AGAIN!

* more spans

* runtime issue, wording, and simpler crowbar

* changes a 1, to a TRUE
 2023-04-22 09:17:35 +02:00
Coolrune206
2478724a09 tourte is knocking on my window requesting stuff (#20693) 2023-04-22 09:17:17 +02:00
MisterMovie
55454c5347 Tracking implants now emit a GPS signal (and other related features) (#20687) 
* Tracking implants now emit a GPS signal (and more)

* lewcc's review

* Sirryan2002's review
 2023-04-22 09:17:07 +02:00
Henri215
72402e782b Updates the U.S.S.P with new looks and loadouts for admins v2 (#20669) 
* Custom USSP roles for admins

* Added the sprites for new USSP

* conflict part 2

* Elder Gods please make this work

* new style for soviet box

* Added Soviet headset

* lets fix this conflict

* Die conflict!

* Sirryan review

* Apply suggestions from code review

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

* Lets solve this conflict

* Die conflict!

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2023-04-22 09:16:56 +02:00
GDN
93fc25782f makes clingstings GC (#20656) 
* makes clingstings GC

* steels review
 2023-04-21 23:53:30 -05:00
GDN
8443203af9 greatly improves observer GCing (#20560) 
* greatly improves observer GCing

* works on logout now
 2023-04-21 18:06:34 -05:00
Cocacolagua
1c75031712 Walking over syringes without protection injects (#20873) 
* gets injected... whoops!!

* rev1ew

* rev2ews

* r3vi3w

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

* r4view

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

* review5

---------

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2023-04-21 20:34:40 +01:00
BiancaWilkson
5751f6e1ff Adds parrying to CQC (#20634) 
* heh, almost made me use ten percent of my power

* appeasing the GC gods (GDN)

* hee hoo

* Update code/modules/martial_arts/cqc.dm

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

* Update code/game/objects/items/hand_item.dm

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

* more return styling

* Update code/modules/martial_arts/cqc.dm

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

* no more wrapper

* the extent of my spriting skills

* fixes double slap sound

* slap emote also works

* try to remember the advanced lessons of CQC

* i hope this fixes the merge conflict

* Chefs are no longer perma-combat trained

* Chef CQC now uses signals to activate parrying

* Makes it easier to add it to other martial arts

* resolving merge conflict from ParadiseSS13#20620

* Revert "resolving merge conflict from ParadiseSS13#20620"

This reverts commit 30ea29a6a8.

* Revert "try to remember the advanced lessons of CQC"

This reverts commit e8daeb4d1a.

* try to not conflict the basics of CQC

* Update code/modules/martial_arts/cqc.dm

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

* Update code/modules/martial_arts/cqc.dm

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

* lol, lmao even

* GDN was right, this is funny

* Update code/modules/martial_arts/cqc.dm

farie review pt. 1

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

* Update code/modules/martial_arts/martial.dm

farie review pt. 2

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

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

farie review pt. 3

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

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2023-04-15 22:18:18 +02:00
Burzah
e85094ed32 ERT Medkit Revision (#20658) 
* Update code/modules/reagents/reagent_containers/pill.dm

Co-authored-by: Adri <33333517+Miraviel@users.noreply.github.com>

* Seperated the Red and Gamma Patch Packs
Changed some colors for the patch packs/pill bottles

* Update code/game/objects/items/weapons/storage/firstaid.dm

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

* Update code/game/objects/items/weapons/storage/firstaid.dm

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

* Update code/game/objects/items/weapons/storage/firstaid.dm

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

* adjustments to patch packs

* format fix

* inheritance adjustment

* adjusted medince to reflect changes to SR

---------

Co-authored-by: Adri <33333517+Miraviel@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2023-04-15 21:59:19 +02:00
GDN
87d69f93b4 Balances the borghydro (#20660) 
* Balances the borghydro

* better comment
 2023-04-15 21:59:11 +02:00
Cocacolagua
3a7ea0ff90 Tweaks and Fixes to Slip Shoes (#20686) 
* tweaks slip shoes

* yeah this is how bitflags work

* oops hehe

* blows up your mind

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

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2023-04-15 21:58:57 +02:00
BiancaWilkson
c394c12e80 shuvel (#20825) 2023-04-14 20:18:58 +01:00
Charlie
e6085895c1 burn wounds, for real this time (#20542) 
* burn wounds

* user feedback

* ready for review

* sean review

* Apply suggestions from code review

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

* surgery fix

* other repair methods

* GDN review

* health scanner feedback

* Update code/game/objects/items/devices/scanners.dm

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>

* bodyscanner print out

* Update code/game/machinery/adv_med.dm

---------

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>
 2023-04-14 15:58:38 +02:00
Coolrune206
7293b7ecbd Allows admins to freeze the SM (#20616) 
* allows admins to freeze the SM

* Hal9000 Review

* now works better than deleting frozen mobs!
 2023-04-13 16:37:18 +02:00
Nathan Winters
ddbae79e7a Removes a duplicate definition of Hot Chocolate (#20836) 
* Merge this

* Move that
 2023-04-08 19:49:57 +01:00
unknownuser782
960d9e3ce0 Fixes t-ray scanners and map editing (#20725) 
* t-ray scanner fix

* fix map editing

* autodoc stuff

* don't hide vents and things

* misc layer fixes
 2023-04-08 08:14:34 +02:00
Henri215
9d4ea47ba7 Fixes headpockets not being able to store small items (#20835) 2023-04-07 17:01:59 +01:00
Henri215
cb4a29037f Adds the trash bag of holding upgrade for janiborg (#20548) 2023-04-04 09:49:32 +01:00
GDN
7727e5d91b Changelings are no longer gibbed by SR (#20507) 
* Changelings are no longer gibbed by SR

* forgot to remove this 💀

* actually balance just wants this

* Update code/modules/reagents/chemistry/reagents/medicine.dm

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

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2023-04-04 09:47:33 +01:00
GDN
f456dffd66 adds the judge armor and helmet (#20623) 
* adds the street judge armor and helmet

* better helmet

* species sprites

* Moved to contraband, -1 per

* whoops
 2023-04-04 09:46:28 +01:00
Farie82
d37d998bc8 Ghosts now don't call moved twice (#20751) 2023-04-04 09:43:46 +01:00
GDN
6ac3c0a90f xenoborgs can now select any normal borg module as well as the hunter module (#20423) 
* xenoborgs can now select any normal borg module and the hunter module

* improved

* no longer returns force modules if there are already force modules
 2023-03-30 23:45:16 +02:00
S34N
68b6608681 Adds more admin logging to newscasters (#20703) 
* Big brother is watching

* le AA

* aa2

* simplify
 2023-03-30 20:41:20 +02:00
GDN
e7a7fa82c7 makes caseless ammo GC (#20726) 
* makes caseless ammo GC

* fox and ryan reviews
 2023-03-29 17:27:28 +02:00
Henri215
5570fc2977 Adds the camera failure event (#20568) 
* camera failure event

* Increasing the amount

* No disabling cameras on protected areas

* scales up with number of engineers

* Update code/modules/events/camerafailure.dm

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

* conflict fix

* better file name

* better name part 2

* farie review

* Apply suggestions from code review

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

* Update code/modules/events/camera_failure.dm

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

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2023-03-28 22:10:33 +02:00
PopGamer46
542cfa919b fixes voice analyzer issues with clown´s different font speech (#20605) 
* clown recording working on for clown fix

* Update code/modules/assembly/voice.dm

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

---------

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2023-03-28 21:45:22 +02:00
ppi13
12553f7d77 Updates text to correctly display changes brought on by #523 (#20729) 2023-03-27 21:45:09 +02:00
Cocacolagua
e7f4a8ffae Fixes flipping through walls (#20714) 
* no more flipping thru da walls!!!!

* now it works on mobs on harmintent

* ...and tables

lewl

* resolve. mhm.hm yeah.

* lol

* yeah whatever you say REVIEWER

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

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2023-03-27 21:30:31 +02:00
S34N
32cb530b0f Fixes (ALERT) button being shown to non-admins in a chat window admin PM (#20710) 
* alert fix

* Update code/modules/admin/verbs/adminpm.dm

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

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2023-03-27 21:29:10 +02:00
GDN
0a9d891b42 fixes revolution not working (#20709) 2023-03-27 21:28:29 +02:00
MisterMovie
7b4491f31a Fixes a bug with chemistry and medical machines. (#20504) 
* Fixes a bug with chemistry machines.

* Fixes cryo cells and sleepers

* lewcc's request
 2023-03-27 21:18:48 +02:00
FallingLights
9ce84a827a Added prox_sensor to items list magnetic gripper (#20632) 2023-03-27 21:11:48 +02:00
S34N
b90845c2e3 Balances skeletons by adding a subtype (#20587) 
* balance skellies

* spoopy and scary

* more skellybones

* Ancient

* Apply suggestions from code review

* Update code/modules/mob/living/carbon/human/species/skeleton_species.dm

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

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2023-03-27 20:39:24 +02:00
S34N
fa040cdb65 Fixes gamma armoury hatch cheese (#20479) 
* Fixes gamma armoury hatch cheese

* mira fix
 2023-03-26 15:08:54 -05:00
S34N
a65706a368 Fixes missing stacks, wonky ORM icons (#20717) 
* oh god why

* lol TGUI rebuild
 2023-03-26 13:16:21 +01:00
Zelf
6d5de3872f enthralled flared and imp (#20508) 
for real this time
 2023-03-26 12:25:46 +01:00