cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-26 10:12:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,092 Commits 26 Branches 2 Tags
4e40353cfa9375bcf2ebd1182e4591663d36fedc
Commit Graph

490 Commits

Author SHA1 Message Date
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
Dennis
13512ba21a Added mutatelist = list() to onion/red (#15858) 2021-04-09 18:05:25 +01:00
SabreML
76e237edc5 Fixes HUD sunglasses deconstruction (#15444) 
* sunglasses

* Unit test test

* Unit test test tested
 2021-03-14 13:17:20 +00:00
AffectedArc07
f2770ed6be Merge remote-tracking branch 'ParadiseSS13/master' into brutal-part1 2021-03-11 18:41:17 +00:00
Fox McCloud
fdc6ab2211 Damns Devils Gamemode to Hell (#15672) 
* Damns Devils Gamemode to Hell

* Update config.txt
 2021-03-07 12:00:02 +00:00
Fox McCloud
88c00d12c6 Nettle Pickup Fix (#15630) 2021-02-28 12:51:07 +00:00
Fox McCloud
20485c029b Pickup and Dropped Bugfixing (#15575) 2021-02-24 19:23:31 +00:00
Fox McCloud
efa3aecb61 Ports TG Pickup, Equip, and Drop Sounds (#15572) 
* Ports TG Pickup, Equip, and Drop Sounds

* really
 2021-02-24 12:51:59 +00:00
Fox McCloud
02b9445b9b Refactors DNA Mutations; Refactors Mutations to use Traits (#15483) 
* Refactors Mutations

* traits

* more work

* styling fix

* yet even more work

* oh hush

* almost there

* it continues yet further

* and that's genetics done

* and that's it folks

* last bit and golem fixup

* oof

* oops

* tweaks and fixes

* styling
 2021-02-21 21:25:19 +00:00
Qwertytoforty
827ab7786a Nerfs botany potatoes 2021-02-07 10:47:54 -05:00
Fox McCloud
8947e97f3b Refactors Electrocution and Tesla Zapping (#15357) 
* Refactors Electrocution and Tesla Zapping---Improves Supermatter and Tesla

* forgot this one

* fixes and styling

* last tidbits hopefully

* machine frames

* use flags

* styling
 2021-02-03 20:52:03 +00:00
AffectedArc07
f5f97882cf BRUTAL Part 1 - No proc var/ in procs 2021-02-01 14:10:08 +00:00
sneksnek
fdb8b94c3c Adds mint, a new plant that can be processed into menthol (#15383) 
* Update medicine.dm

* Update herbals.dm

* Update vending.dm

* added mint seeds

* added mint harvest

* added mint plant

* an attempt to fix the problem

the pr is having trouble with growing.dmi for some reason, i was told to do this

* another empty line for the above reason

* wow okay, be like that then

* no empty lines since you're bickering

* lets see if you like this

* forgot the mint chem in reagents/misc.dm

daily reminder that im a smooth brain

* made it green and distill into menthol

* made it goon

* moving it to the appropriate file

* moved to food.dm since it's a consumable

* clarification of new distilling result for desc
 2021-01-30 16:53:51 -05:00
AffectedArc07
8f72d7556e Annihilates the blackbox (#15132) 
* Lets get this show on the road

* Now were talking

* These matter

* Oh the joys of CI testing

* And this

* Wrong version

* Tweaks

* More tweaks

* Lets document this

* This too

* Upgrades this

* Fixed some sanity issues

* This too

* Screw it, this too

* More sanity

* And these

* This too

* Documentation

* This too

* Fixes **awful** scoreboard logic

* Why do we care about only half-absorbing someone

* Revert "Why do we care about only half-absorbing someone"

This reverts commit 8de1cfdf05.

* Refactors these

* Hashing

* Moxian tweaks
 2020-12-24 16:06:48 -05:00