cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-31 20:53:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,098 Commits 26 Branches 2 Tags
bdf50ea89400a5d080df567b99025b399eaeee5a
Commit Graph

503 Commits

Author SHA1 Message Date
Marm
51f870595e Nerfs Deathnettle (#18128) 
* Nerfs Deathnettle (I hate plants)

* Update nettle.dm

Early returns are good apparently.

* Stage of grief: fear

Should fix errors?

* Update code/modules/hydroponics/grown/nettle.dm

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2022-06-30 19:00:29 +01:00
Charlie
bead47ea29 Adds crawling. (#17899) 
* crawling?

* knockdown. CONTAINS CHANGES THAT NEED REVERTING

* plotting can_moves death

* CANMOVE IS DEAD

* mappers are insane

* removes todos as the are todone

* decreases crawling speed

* silly-con fixes

* surgery fixes

* fixes death

* pAI fixes

* removes var/lying

* runtime fix

* decreases default crawling speed

* correct crawling dir

* some more fixes

* stunbaton tweak, revert later

* rejuv fix

* restraint and incapacitated refactor

* crawling dir in line with TG

* fixes vehicle movement and grabs

* alien rest fixes

* antistun fixes

* fixed fall sounds

* forgor to stage this

* first review

* canmove zombie dispersal

* fix

* lots of fixes

* defines

* fixes the trait helper

* if you got no legs you can still crawl

* sillyconfix

* no reverty keepy

* jaunt fix

* hopefully fixes perma sleepy zzz

* admin rejuv temp fix

* rest canceling

* antistun chems now remove knockdown

* buckle offset fix

* fixes some stuff

* crawling delay = 4

* descuffs bed

* sleeping hotfix

* fixes simple mob resting

* V is the macro for resting

* projectiles no dodgy

* refines the projectile check

* god I hate strings

* MORE FIXES

* I hate buckling

* fixes capulettium plus

* winding down

* farie review

* bugs did stop showing up

* SEAN

* todo

* sean review

* ed209

* i HATE cyborgs

* steel review

* laaaaaast things

* reverts stun baton changes

* and done
 2022-06-30 11:57:52 -05:00
moxian
09e7f54a43 Convert most of /obj/machinery to use Initialize rather than New (#17845) 
* Switch a bunch of /obj/machinery from /New to /Initialize

This is an easy and uncontroversial batch.
No globs, no late init, and stuff.

* Move more machinery to Initialize

This time the ones dealing with GLOB vars,
as well as some simpler ones i missed previously.

* More tricky New -> Initialize migrations

* The last of machinery Initialize conversion

* fixups

* Newscaster armor fix

* styling

* Comment on armor handling

* Move newscaster armor definition back to datum

* farie82 review

* kill extra .=

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

* farie's review part 2

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

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2022-06-29 08:33:52 +02:00
Charlie
0f7a8707ef [Ready] Refactors stuns and status effects. (#17579) 
* Fixes reviver runtime

* Confusion status effect

* Dizzy status effect

* Drowsiness status effect

* decaying -> transient

* Drunkenness status effect

* why use timer when SSfastprocessing work good

* stuns (mostly)

* weaken and immobalise

* stun/weaken times

* update_flags redundancies.

* Slowed()

* Silence + fixes transient decay

* Jittery

* sleeping

* Paralyze -> weaken

* Cult sluring

* paralyse

* Stammer

* slurring + projectile cleanups

* losebreath

* Hallucination

* forgor this

* eyeblurry

* eye blind

* Druggy

* affected didn't like my spacing

* review pass

* second review pass

* some cleanups

* documentation and signal framework

* confusion fix

* Fixes spec_stun

* rejuv fix

* removes a TODO

* conflicted myself

* fixes

* self review

* review

* removes TODOs

* adminfreeze

* TM fixes

* hallucination fix + others

* tones down alchol and runtime fixes

* confusion overlay suggestion

* more fixes

* runtime fix

* losebreath fix

* clamp => directional bounded sum

* steel review

* oops

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

* reduces the dizziness cycle rate

* borg hotfix

* sanctified decursening

Co-authored-by: mochi <1496804+dearmochi@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2022-05-24 16:35:26 +01:00
DamianX
0766c6d236 Fixed thrownby hard del (#17686) 2022-05-16 22:48:42 +09:00
atteria
bcf90593ed Improves belt item overlay code, Adds new belt item overlay sprites (#17568) 
* belt-improvements-and-sprites

* fixes my fix of botany belt allowed contents
 2022-04-12 15:57:21 +01:00
SteelSlayer
b723999741 clownfish 2021-11-14 23:26:49 -06:00
PacifistDalek
cf5ccab58b missed something 2021-10-14 13:10:41 -04:00
PacifistDalek
58f642fa7a content 2021-10-14 13:06:30 -04:00
AffectedArc07
221ea814d8 Revert "Whole bunch of Hydroponics Sprite changes" 2021-10-14 08:00:32 +01:00
PacifistDalek
f9849cd1f3 where the bananas are blue and their peels are slippy 2021-10-13 15:08:37 -04:00
PacifistDalek
9fb48626e8 take me down to hydroponic city 2021-10-13 13:58:14 -04:00
PacifistDalek
eb9fede50b Still need to change filling colour of flowers 2021-10-12 15:48:34 -04:00
Fox McCloud
ee22c8d4ee Refactors Item Blood Overlays (#16826) 
* Refactors Item Blood Overlays

* update

* remove blood color changing
 2021-10-01 21:57:54 +01:00
SabreML
51c2c8840d Telescopic baton/scythe blood overlay fix 2021-09-25 00:11:56 +01:00
variableundefined
a271eb71a6 Merge pull request #16672 from botka4aet/BoneItems 
New tribal craft items(pickaxe and scythe)
 2021-09-17 21:34:35 -05:00
botka4aet
ebf20f8806 Bone items review fix 2021-09-17 11:13:32 +03:00
Fox McCloud
b98929ac20 Removes Separated Chemicals 2021-09-15 13:14:27 -04:00
botka4aet
d49cfd2322 2 new tribal items 2021-09-10 11:07:54 +03:00
variableundefined
3dae44217a Merge pull request #16383 from theo-3/seeds_naming 
Allows players to name seed packs to keep track of modified plants
 2021-09-06 23:17:53 -05:00
theo-3
230a0c4425 I missed an outdated comment... sorry about taht 2021-08-13 12:27:15 +03:00
theo-3
6a42cf2d3d Refactor checks 
Less nesting is good
 2021-08-13 12:14:01 +03:00
theo-3
3da97c06c9 Better feedback for variant renaming 
Initialize variant to null, so the prev check doesn't mess up the first time
Add removal message to modder "remove" for consistency
No message if variant was not changed
 2021-08-13 11:44:13 +03:00
theo-3
abeb522e58 Fix remote renaming with gene modder 
Also improve comments, the null check thing could confuse people
Is sanitization even supposed to break nulls???
 2021-08-13 11:24:03 +03:00
theo-3
d0e8dfd69a Mispelled =, whoops 2021-08-12 15:48:56 +03:00
theo-3
8a8b7b16a6 Use null instead of empty string, fix all string checks 2021-08-12 15:45:36 +03:00
SabreML
02fe0876f5 Fix bundle #3 (#16411) 
* Explosive implant

* Package wrapper

* Venus human trap sprites

* Vine damage

* Wisp vision

* Display case

* Storage viewing

* Ghost poll nullspacing

* Inflatable barrier piercing

* Pneumatic cannon

* Cow grammar

* Centcom jaunting

* Consistency

Not actually a lazy list, as far as I can tell

* Review 1

Co-Authored-By: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Review 2

Co-Authored-By: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* length()

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2021-08-05 11:04:27 +01:00
theo-3
39d38e756b Refactor prompt, add naming to trays 
Variant prompt is moved to proc, adj parameter controls what Adjacent is called from
Proc is used from gene modder and from trays
Renaming messages are replaced with a simpler notice
 2021-07-31 11:49:15 +03:00
theo-3
a6f9e7ce15 Fix some gene modder checks 
del_v doesn't need checks since it doesn't have input prompts
Added null check after input
 2021-07-26 15:16:12 +03:00
theo-3
4779a5df0c Fix cancel not working. Also fix silicons having to be adjactent 2021-07-26 10:31:26 +03:00
theo-3
ba58a7412c Minor refactoring 
Use [] instead of +
 2021-07-24 09:58:18 +03:00
theo-3
2f4aee2021 Make variants show up on growns 
This will make growns with different variants be separate in a plant bag
 2021-07-24 09:58:18 +03:00
theo-3
c177cd3bf7 Improve apply_variant_name 
Use initial(name), check for experimental and labels
 2021-07-18 16:29:35 +03:00
theo-3
dad5308456 Fix missing return 2021-07-18 10:49:08 +03:00
theo-3
15c67d487a Reduce max len to 64 2021-07-18 10:48:24 +03:00
theo-3
fadd29e929 Move variant div in gene modder down 2021-07-17 19:02:13 +03:00
theo-3
65d58cdff5 Only show 'remove' if variant != "" 2021-07-17 17:30:36 +03:00
theo-3
8271395401 Use <span class='info'> 2021-07-17 14:18:15 +03:00
theo-3
0879b0edcd Add remove variant option to gene modder 2021-07-17 13:43:47 +03:00
theo-3
0154d93a73 Use if() instead of if () 
CONTRIBUTING.md says I'm supposed to do it this way
 2021-07-17 13:36:01 +03:00
theo-3
c0fede11df Add variant editing to gene modder 2021-07-17 13:35:49 +03:00
theo-3
6953f74295 Use [] in seeds name 
Looks better
 2021-07-17 13:16:54 +03:00
theo-3
eee8b7671f Add variants to seed extractor UI 2021-07-16 21:29:04 +03:00
theo-3
994a9b5229 Add plant variant naming 2021-07-16 20:42:18 +03:00
AffectedArc07
ed11899f11 Merge branch 'master' into toml-config 2021-06-23 08:44:32 +00:00
SabreML
0b375de42c Removes the the vast majority of 'The the' from the the code (#15597) 
* The the

* Some more

* Review 1

* A couple more
 2021-06-20 10:20:32 -04:00
AffectedArc07
7486d026b7 READY 2021-05-23 17:26:17 +01:00
Dragonkiller93
544ed9e2c4 FIxes apiary text for queen placement. (#15954) 
* FIxes apiary text for queen placement.

* Update code/modules/hydroponics/beekeeping/beebox.dm

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

* Sets gender of queen bee instead.

* Revert "Sets gender of queen bee instead."

This reverts commit 409df4a22d.

* Sets queen bee gender instead.

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2021-05-08 22:09:44 +01:00
Pidgey
e444ecbf97 Added Wasabi - a pungent spice found in basic nettles. (#15870) 2021-05-04 21:38:56 -04:00
SabreML
fb06547f97 Various bugfixes (#15873) 
* pAI Record Fix

* AI Respawnability

* Wine Reagents

* Ghost Repulsing

* Agent ID Card Numbers

* Maint Drone Lights

* Fix fixes

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

* Headpocket runtimes

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2021-04-19 14:50:30 +01:00