cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-09 17:13:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
56,598 Commits 26 Branches 2 Tags
4efc40ccac1efbe6d7bd78d3da7f367cd8dcb0a9
Commit Graph

41661 Commits

Author SHA1 Message Date
larentoun
4efc40ccac [FIX] Jobbaned can't spam-spawn as cult harvesters (#21656) 
* fix: jobbaned can't spam-spawn as cult harvesters
https://github.com/ss220-space/Paradise/pull/1283

* fix: oops, what is this check?

* smoke needs create_smoke
 2023-08-16 19:50:21 +01:00
Silverplate
ff909adfb1 Adds Species Unique Traitor Gear (ready for review edition) (#21313) 
* Vars and ideas

* Adds supercharge implant

* species specific tot gear!

* Adds vox spikethrower

* Adds Love injecting pen (skrell)

* sprite issue fix

* typographical error.

* makes pen not refillable, pacifies

* Adds fireproofing nanite injector (plasmaman)

* Lower KD on spikethrower per qwerty

* Lewcc review

* aaaa so much space indentation

* steelslayer review

* Steelslayer review

* Lewcc reviews

* Changes the spans

* Lewc review, Thanks to DG for doing my PR for me.

* Update code/modules/projectiles/guns/energy/special_eguns.dm

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

* Henri review

* Forgot this one

* Whoopsie number 2

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2023-08-16 19:25:25 +01:00
DGamerL
545285e4e8 Fixes an issue with raging mages and slightly cleans up the code around it (#21931) 
* The thingy

* Henri review
 2023-08-16 19:17:30 +01:00
Edan
8cdd9c766e renames traitor cling & vampire (#21980) 2023-08-16 18:39:16 +01:00
Charlie
d54ac7720e Ports the martial art combo counter from TG (#21943) 
* c-c-c-combo

* sean review

* farie review
 2023-08-16 18:44:01 +02:00
Burzah
4150373d43 Reworks Bear Traps (#21941) 
* beartrap trigger on find

* fixed an oversight

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

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

* 2 second timer for arming a trap

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

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

* adjust breakout time

* apply extra damage if bear

* 15% to delimb on opening bag

* reverts delimb

* first set of review changes

* small adjustment

* spring_trap proc work

* spring_trap first pass

* spring_trap take two

* code formatting and simple mob damage

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

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

* review fixes

* Apply suggestions from code review

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

* a little code cleaing for review

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

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

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

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

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2023-08-15 14:51:54 +01:00
Venuska1117
a1c9f95a3f Blacklist "Forsaken" Cat from Gold Extract Spawn. (#21852) 
* Fix Forsaken Cat spawn from Gold Slimes.

* Typo

* ???

* eeehhhh... no funky text
 2023-08-15 14:51:20 +01:00
DGamerL
c2f9228988 [s] Fixes several clingspider related runtimes and fixes spiderlings growing into infestation spiders (#21988) 
* The fixes

* Steelslayer review
 2023-08-14 20:52:15 -05:00
Henri215
b39f1ed204 Fixes non humans having white blood (#21984) 2023-08-13 18:48:35 +01:00
JimKil3
58f2d4b185 da fix (#21961) 2023-08-12 19:33:46 +01:00
Sadhorizon
f4867108a0 Fancy ants: kidan suit sprites. (#21922) 
* stuff

* all of the suits
 2023-08-12 19:30:46 +01:00
benjicoots
cc13c52fed Make air alarms start with the correct default state when placing the… (#21635) 
* Make air alarms start with the correct default state when placing the frame

* Update code/game/objects/items/mountable_frames/air_alarm_frame.dm

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

* undefs to allow CI passing

* define moment

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2023-08-12 19:27:42 +01:00
DGamerL
0b5a3e692f Vampires now don't get toxin damage from drinking a wrong blood type (#21776) 
* normal blood works

* slime jelly

* this is now cleaner

* also this is a bit cleaner

* Hal review

* Hal review

* now slime vamps won't get double the blood
 2023-08-12 18:57:21 +01:00
GDN
a4010a9525 buffs the mind batterer (#21758) 2023-08-12 18:54:19 +01:00
Evаn Summers
cf2a4380f6 Fix: stop magic staff recharging while already at max charge (#21692) 
* Fix for staffs recharging while at max charge

* Update code/modules/projectiles/guns/magic.dm

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

* Update code/modules/projectiles/guns/magic.dm

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

* Update code/modules/projectiles/guns/magic.dm

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

* Update code/modules/projectiles/guns/magic.dm

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

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2023-08-12 18:51:22 +01:00
Deniz
7e712e2d29 [TGUI] BotStatus.js for tidier TGUI code for bots (#21631) 
* Cleanbot merge

* botstatus update

* TGUI Bundle

* TGUI Bundle

* bundle
 2023-08-12 18:50:07 +01:00
GDN
6054407f25 reworks reactivate cameras for malf ai (#21613) 
* reworks reactivate cameras for malf ai

* bam
 2023-08-12 18:45:57 +01:00
Contrabang
5c18bbeedf this was a hard one (#21598) 2023-08-12 18:45:14 +01:00
Qwertytoforty
7907e1dc38 Only malf AI can hack doors with cut ai wires, flash emps cameras (#21610) 
* Only malf AI can hack doors with cut ai wires, flash emp

* weaker emp = less time

* Apply suggestions from code review

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

* Apply suggestions from code review

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

* Apply suggestions from code review

Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>

* FLASH. AH AH

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>
 2023-08-12 18:43:05 +01:00
DGamerL
121603c825 The sleepy pen, hypospray and RSG will now all do initial chemical reactions when they inject a chemical (#21722) 
* fuck it we ball

* I hate math

* Updates people, updates (also jimkil review)

* okay this should work better

* Will it work?
 2023-08-12 18:41:28 +01:00
JimKil3
eb69f11a1b Adds RTS-like camera controls to AI (#21625) 
* REMOVES sillycons (their keybinds)

* adds the feature

* comment fix

* mech fix

* lewcc review
 2023-08-12 18:38:10 +01:00
GDN
e8ead6267b item actions can be used while horizontal (#21866) 2023-08-12 18:25:12 +01:00
Qwertytoforty
823ca7570a cryo vetus slip nerf (#21865) 2023-08-12 18:24:50 +01:00
DGamerL
d27b36d021 Slightly refactors makeTrail() and adds a few comments (#21863) 
* The refactor

* Gaxeer review

* Some more reviews

* Last Gaxeer review

* Moving around the comments a bit

* oopsie

* Sirryan review
 2023-08-12 18:24:30 +01:00
matttheficus
32e023b85e Adds Basic Observer Outfits for Admin/Testing Use (#21846) 
* admin outfits

* swap to bag

* space oopsie

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

* contra + lewcc reviews

* copy paste moment

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2023-08-12 18:23:53 +01:00
warriorstar-orion
124f222ec0 feat: clicking on wallmaps prompts to open webmap (#21840) 2023-08-12 18:23:38 +01:00
warriorstar-orion
70dfb4ef6c feat: make scrambled trinary appear compressed (#21837) 2023-08-12 18:23:21 +01:00
GDN
36d6c0f967 false alarm now sounds the sirens (#21773) 2023-08-12 18:22:56 +01:00
1080pCat
34622bcfe4 16 minutes is way too long (#21741) 2023-08-12 18:22:36 +01:00
Contrabang
b1eda77f01 Adds happiness (a new chemical) (#21718) 
* Adds happiness

* epic linter fail

* epic comma fail

* fuck i forgot to change the name

* deconflict it PROPERLY

* jimkil review
 2023-08-12 18:22:18 +01:00
Fridge Burns
2f711fb321 Screwdrivers can now be recycled in autolathes (#21629) 
* screwdriver can be put into autolathe

* Redundant and misspelt  comment

* minutia

Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>

* add COMSIG_TOOL_ATTACK

* tools can be inserted on harm intent

* use signal to allow screwdriver to be inserted into the autolathe

* accidental spaces

* parenthesis for clarity

* snake_case 1

Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>

* snake_case 2

Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>

* dont direct istype check the screwdriver

* . defaults to null

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

* add SIGNAL_HANDLER to the proc that handles a signal

---------

Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2023-08-12 18:21:17 +01:00
Qwertytoforty
4748736c9e Ports TG staff of storms / updates sprites (#21566) 
* Ports TG staff of storms / updates sprites

* I *said* it *doesn't* work in SPACE!

* Update legion_loot.dm

* requested changes

* icons fixed
 2023-08-12 18:20:57 +01:00
Eric6426-Blossom
66374af694 ClingspiderRework Revival (#21435) 
* ClingspiderRework Revival

* No sentient pots

* HenriReview

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

* ChangesP1

* ChangesFix(I'm dumb)

* Fix(?)

* Revert "ChangesP1"

This reverts commit 91d340dc95.

* lewcc review

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

* ChangesP2

* GibGib

* Le text

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2023-08-12 18:20:19 +01:00
warriorstar-orion
c45b8edb0f Fix two typos. (#21965) 
* Fix one typo and two invalid job map entries.

* Fix IAA, add stacktrace call.
 2023-08-12 10:44:28 +01:00
Divulf
be0cd179d3 Adds 5 mannitol pills to the psychiatrist's pill bottle (#21557) 2023-08-11 15:36:53 +01:00
Qwertytoforty
bcce813e0a Beanbag shot now throws a tile. Increases the spread on rubbershot / lasershot / weakbuckshot (#21501) 
* Beanbag shot now throws a tile. Increases the spread on rubbershot / lasershot / weakbuckshot

* Apply suggestions from code review

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

* makes it compile, uses starting.

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2023-08-11 15:35:16 +01:00
efzapa
92db3304e5 Adds the Bluespace Shotglass (now with actually good codersprites) (#21867) 
* blamo new branch new PR

* fixes update_name

* changes BSS sprite

* adjusts RnD levels a bit
 2023-08-11 15:34:34 +01:00
Burzah
f599d87dcf Fixes blumpkin juicing (#21947) 
* blumpkin juicing fix

* there can be only one
 2023-08-11 15:34:23 +01:00
DGamerL
0264614ab1 Halves the time needed to hack a door with the access tuner (#21895) 
* halves speed

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

Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>

---------

Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>
 2023-08-11 14:30:14 +01:00
Henri215
4398e2c003 Fixing common spelling mistakes part 4 (#21945) 2023-08-10 17:27:20 -05:00
DGamerL
f9b274cc9d Fuckfuckfuck (#21944) 2023-08-10 17:16:35 -05:00
GDN
070157567d morphs no longer get sent to nullspace (#21940) 2023-08-10 17:12:59 -05:00
Qwertytoforty
4e96730cae [s] fixes a bug (#21939) 
* REAL PAIN. REAL SUFFERING. REAL GOD WHY AAAAA.

* more space per space
 2023-08-10 17:10:25 -05:00
1080pCat
7705f3af1f actually updates now yippie (#21932) 2023-08-10 17:04:21 -05:00
Henri215
8eaba9f40f Fixes a floor thing (#21962) 2023-08-10 14:18:53 -05:00
DGamerL
cdef637e7f Stops guardian spirits from being buckled (#21896) 
* the fix

* We use defines now
 2023-08-07 22:45:29 +01:00
Contrabang
ce8c7fa55b Fixes some issues with the debug menu (#21600) 
* fixes debug menu

* guh, scuffed implementation

* user.client -> parent

* deconflict

* please fix it? executable?
 2023-08-06 04:13:27 -05:00
S34N
b589d0df29 gorilla death (#21917) 2023-08-05 13:40:29 -05:00
Burzah
d5a719ac3a pills into patch pack fix (#21908) 2023-08-05 13:37:24 -05:00
Qwertytoforty
8336eecd00 Nerfs suitless spacewalking: Cryoxodone now stuns while healing. (#21556) 
* qwerty remeber you made this and publish this

* removes comment due to testing

* just change tcryo dofus

* Cryox that is ingested will not work as it freezes in your mouth

* hmm yes

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

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

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2023-08-05 14:13:35 +01:00