cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-29 11:41:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
57,180 Commits 26 Branches 2 Tags
bcc68500adbc652ca2bcae7674ebbaa73c33e451
Commit Graph

26149 Commits

Author SHA1 Message Date
Luc
bcc68500ad Minor card tweaks (#22568) 
* cards

* Better handles cards

* update descriptions, limit visual size to 20

* Add alert so you don't dump your whole hand by mistake

* Update code/modules/games/cards.dm

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

* sirryan review

* Update code/modules/games/cards.dm

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

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2023-10-12 15:21:56 +01:00
Bjamcham
af8d0b2fb8 RPDs for all (#22792) 2023-10-10 21:53:56 +01:00
Deniz
cae43f1f69 TGUI Bots Refactor (#22778) 
* test

* M to user

* M to user

Did on phone after remembering user is is better than M. So it is individual commits

* small oopsie

* /bot/ui_data. thanks contra

* forgot comments

* comment edit

* test commit - ignore

* test worked
 2023-10-10 21:53:48 +01:00
Qwertytoforty
3623116112 vinegar and a vinegar included food (#22764) 
* vinegar and a vinegar included food

* nerfs taste values

* flavor, new icon

* Update code/modules/food_and_drinks/recipes/recipes_grill.dm

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

* Update code/modules/food_and_drinks/food/foods/ethnic.dm

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

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2023-10-10 21:53:36 +01:00
Octus
c3a78f9ce0 Removes Beach Bums, Adds Althland Excavation Pit (#22315) 
* replace

* Update lavaland_biodome_beach.dmm

* fixes

* we are so BACK bros

* oh yeah, now were cookin

* turf

* oops!

* Update lavaland.dm

* work you fuck

* donedonedoneeeeeee
 2023-10-10 21:44:58 +01:00
Qwertytoforty
64456806a5 [READY FOR REVIEW] I killed bubblegum on hard mode and all I got was this stupid medal. Adds hard mode to megafauna. (#22016) 
* hard mode stuff

* further progress

* more progress

* pausing work to fix bug

* lets pr this mess

* more progress saving as vacation soon

* sleep_check_qdel

* saving work

* medals into deconflicting

* icons

* Fix compilings, medals

* Apply suggestions from code review

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

* yes

* Apply suggestions from code review

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

* earliest of the returns

* icons

* Apply suggestions from code review

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

* Update code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm

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

* ah lateload, my beloved and hated with no debug points

* todoops

* requested changes

* move medals / move comment

* guh

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2023-10-09 21:45:41 +01:00
Qwertytoforty
3b618d47c2 Megafauna are no longer chronically afraid of chasms (#22782) 
* megafauna are no longer chronically afraid of chasms

* drop that

* Update code/game/turfs/simulated/floor/chasm.dm

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

* )

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2023-10-09 20:47:24 +01:00
Contrabang
c043babd51 fixes dusting 2 (#22749) 2023-10-09 20:46:24 +01:00
ZERO-XZB
6f76740f9e Creates research costs for some PKA mods (#22748) 
* req_tech test

* add req_tech to some PKA mods

* var/requires_whitelist test

* forget a newline

* how do I newline

* remove research reqs

* conform to new /// comment style

---------

Co-authored-by: ZERO-XZB <temp@temp.com>
 2023-10-09 20:46:11 +01:00
Mitchs98
a20394b49d Normal tomatoes can now be sliced. Tomato Meat now functions as meat. (#22744) 
* tomat

* tomat 2.0, now with steak
 2023-10-09 20:44:04 +01:00
Bjamcham
d0e85e5271 Expanded Passive Gate Functionality (#22736) 
* Questionable choices

* Syntax fix

* Code improvement
 2023-10-09 20:43:45 +01:00
Vi3trice
1bad99aa5e Naughty unbuckling (#22725) 2023-10-09 20:43:29 +01:00
Mitchs98
22751fb776 Properly informs CQC Headkick does Brain Damage (#22722) 
* the informationing

* Wording change.

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

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2023-10-09 20:43:15 +01:00
Vi3trice
b322eddb49 Now the kicks are not as subtle (#22705) 2023-10-09 20:40:58 +01:00
Vi3trice
8dccc977e7 Add serialization support to Modsuit modules (#22702) 
* Save my supersuit

* Glazed over it when trying to make cores work

* Used contra's code, with a fix to stop runtiming
 2023-10-09 20:40:31 +01:00
Contrabang
35b3418f17 Pick-Darkness verb now supports command box input (#22687) 
* pick darkness update

* oops forgot to remove
 2023-10-09 20:39:15 +01:00
PopGamer46
348c14f736 Makes gun reskins use a radial menu instead of a input menu (#22682) 
* input to radial

* hands blocked trait instead of incapacitated

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

* remove null parameter

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

* rename reskin radial proc

* fix

* shorten code

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

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2023-10-09 20:38:41 +01:00
Contrabang
bedd28d7ea 50 unit transfer! (#22670) 2023-10-09 20:38:09 +01:00
Henri215
a5783c7169 Adds new microtransaction method: Scratch Cards! (#22618) 
* scratch cards!

* Apply suggestions from code review

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

* tweaking values

* maint loot tweak and to_chat

* sprites

* DGamerL review

* adjusting volume

* better like this

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2023-10-09 20:36:24 +01:00
Octus
1ba9bc7cb7 SWIM OR DRIP JACK (#22610) 2023-10-09 20:33:54 +01:00
Christasmurf
5b6a2de4ca Procedure dmi split + IAA resprite (#22580) 
* dmi split and code stuff - species sprites coming soon(tm)

* species sprites

* update sprite name

* CI errors?

* CRLF to LF

* forgor species code

* Update code/modules/clothing/under/jobs/procedure.dm

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

* readds the ability to make cluwnes (how did this happen)

* fuck off shitcode breaking my shit

* Apply suggestions from code review

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

* forgor to delet extra sprites

* Suggestion

* Apply suggestions from code review

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

* Apply suggestions from code review

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

* booleans

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2023-10-09 20:31:38 +01:00
Qwertytoforty
37f2f47a64 Adds blackbox logging to rnd printing. (#22544) 
* Now I'm getting paid cash with atlas earth

* Update code/modules/research/rdconsole.dm

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

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2023-10-09 20:29:40 +01:00
Qwertytoforty
c407395e3a where's that chime (#22503) 2023-10-09 20:29:06 +01:00
GDN
6ac126da0b gives runtime access the ability to view timer logs and debug timers (#22451) 2023-10-09 20:28:31 +01:00
GDN
6df2c2e3d2 Ghost bar (#22368) 
* Ghost bar initial changes

* more changes

* we ball again brothers

* we are (once again) SO back

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

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

* Update code/_onclick/hud/alert.dm

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

* Update code/_onclick/hud/alert.dm

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

* Update code/modules/ruins/ghost_bar.dm

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

* Update code/modules/ruins/ghost_bar.dm

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

* Update code/modules/ruins/ghost_bar.dm

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

* Update code/modules/ruins/ghost_bar.dm

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

* Update code/modules/ruins/ghost_bar.dm

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

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

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

* deck of cards and shittt

* global placement

* Update code/modules/ruins/ghost_bar.dm

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

* readded

* hotfix

* zamn

* fixes

* greyfix

* last of the fixes

* can't stop me baby

* bam

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2023-10-09 19:47:17 +01:00
Burzah
b02ce067bf Adds a nugget smite for admins (#22637) 
* new smites

* part dos

* just nugget

* msg update

* forgot to move this

* Review

* added logmsg

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

Tested and applied!

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

---------

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2023-10-09 20:00:29 +02:00
Contrabang
0512f8a674 wowee (#22787) 2023-10-08 20:05:35 -05:00
AffectedArc07
3e49f1ef29 Strange object refactor (#22774) 2023-10-08 14:26:42 +01:00
Burzah
06c3b3925c missing tc adjustment (#22758) 2023-10-08 03:41:05 +01:00
Alexios
c4e96e4ca0 Ports Humans from TG - Soul Massacre (#22361) 
* Easiest PR of my life - adds new humans and culls your soul -  ProTip! Great commit summaries contain fewer than 50 characters. Place extra information in the extended description. - go fuck yourself github I will post the bee movie script if you don't shut up

* I'm dying because I'm so surprised.......

* I don't have any other memes heres the simplemobs I'll think of something

* Add new sprites and old sprites, man what nice guys

* Add code for first haul of races

* Attempted fix at CRLF to LF

* Fix indentation

* Move last code line fix pp
 2023-10-07 11:16:30 +01:00
K3Licia
ff1fd1d2b8 New Taj Head & Hairstyles (#22349) 
* Delete icons/mob/clothing/modsuit/species/taj_modsuits.dmi

* Add files via upload

* Delete icons/mob/clothing/species/tajaran directory

* Add files via upload

* Delete icons/mob/human_races/r_tajaran.dmi

* Add files via upload

* Delete icons/mob/sprite_accessories/tajaran directory

* Add files via upload

* Delete code/modules/mob/new_player/sprite_accessories/tajaran/tajaran_hair.dm

* Add files via upload

* realized an inconsistency

* Add files via upload
 2023-10-06 16:36:46 +01:00
1080pCat
41474a4d18 Updates the title, and inspect message of portable pumps, and scrubbers. (#22626) 
* mmm silly ctrl+c ctrl+v

* PidgeyThePirate review
 2023-10-06 12:05:01 +01:00
Contrabang
f3f9bd442a Changes slot number defines from lowercase to all uppercase (#22297) 
* undo all of it

* flags

* back

* head/mask

* left

* right

* Cuffs

* other name changes

* ID and PDA

* idk about calling them SLOT_HUD now

* glasses, gloves, and shoes, oh my!

* the rest

* comment
 2023-10-03 18:27:51 +01:00
Vi3trice
33c9a2b7ce Shelters sound like mining now (#22693) 2023-10-03 17:51:16 +01:00
Adrer
f221bf3ec4 You can no longer attack MMIs (#22685) 
Co-authored-by: Adrer <adrermail@gmail.com>
 2023-10-03 17:49:33 +01:00
DGamerL
0fae71b79b Seems to fix it (#22680) 2023-10-03 17:48:13 +01:00
GDN
ffffb84b90 fixes some interface runtimes (#22661) 2023-10-03 17:43:08 +01:00
McRamon
f0fa4e1fd8 H.E.C.C. suit resprite (#22643) 
* Update vampire_powers.dm

* Revert "Update vampire_powers.dm"

This reverts commit 53a0596374.

* NanoMap Auto-Update (Mon Oct  5 06:34:42 UTC 2020)

* sprite

* steam-begone

* fixes

* fix2

* fix3

* fixesN

* Update paradise.dme

* Update paradise.dme

* Update paradise.dme

* Update paradise.dme

* NanoMap Auto-Update (Sat Jan 21 01:38:50 UTC 2023)

* Update paradise.dme

* Update paradise.dme

* removes_shit

* sprites

* all species

* some gigachad coding skills

* welp

* yeah i suck

* i forgot item icons

* Update code/modules/mining/equipment/explorer_gear.dm

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

* a fix?

* okaaaaay

* ha-haa

---------

Co-authored-by: NanoMap Generation <action@github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2023-10-03 17:42:20 +01:00
ZERO-XZB
2b9ca38824 Bug fix for carrot shivs Fixes #22556 (#22627) 
* carrot_progress

* more carrot testing

* closernow

* closernow

* closernow

* closernow

* closernow

* closernow

* closernow

* closernow

* closernow

* closernow

* closernow

* Bugfix for #22556

* Bug fix regarding carrot shivs (#22556)

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

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

* testing item.dmi fix

* hopeful items.dmi fix

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

Adds Contrabang's suggested parens.

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

---------

Co-authored-by: ZERO-XZB <temp@temp.com>
Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2023-10-03 17:40:02 +01:00
1080pCat
6b72ca7045 Fixes canisters constantly 'failing to connect' despite it actually connecting (#22625) 
* smh my head

* Contrabang review
 2023-10-03 17:19:44 +01:00
GDN
fe809bf8e1 fixes new players not always being able to use their keybinds (#22621) 2023-10-03 17:18:17 +01:00
DGamerL
aae6b003d9 That was fcking easy (#22615) 2023-10-03 17:16:43 +01:00
meow20
79f472c84d Drask no longer slow down when cold. (#22612) 
* actual pr

* Revert "actual pr"

This reverts commit 44c2fc296b.

* gamerCode
 2023-10-03 17:14:48 +01:00
Burzah
8f83d8cbf1 File cleanup for ert_outfits.dm (#22607) 
* ert_outfits cleanup

* another one

* a few adjustments
 2023-10-03 17:13:32 +01:00
Luc
3e176f6e0d Carding AIs now takes time. (#22564) 
* Adds a do-after for living AIs

* Fixes some leftovers

* do_after_once
 2023-10-03 17:11:42 +01:00
Qwertytoforty
73df3fcf14 Antimatter now innacurate without zooming. Sniper projectiles are faster / pass through weak stuff. (#22506) 
* I should port the sniper rifle bot from blood blockade battlefront

* fuck that a

* Apply suggestions from code review

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

* variable on bullet

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2023-10-03 17:10:55 +01:00
Qwertytoforty
fe90da76cf Adds jaunter kit (#22496) 2023-10-03 17:09:28 +01:00
Octus
1fc452cef8 Makes the Librarian a little less shit, now they know most languages. (#22460) 
* less shit

* adds some restrictions, handles Matt's request

* fix

* Update code/modules/mob/language.dm

Co-authored-by: Daniel Lenrd <mr.lenrd@mail.ru>

* Update code/game/jobs/job/support.dm

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

---------

Co-authored-by: Daniel Lenrd <mr.lenrd@mail.ru>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2023-10-03 17:08:54 +01:00
Adrer
2672d02eb3 [s] Martial arts granted by equipped items no longer persist through cloning. (#22684) 
* Martial arts no longer persist through cloning

* Remove unnessecary var declarations

* Combo counter

---------

Co-authored-by: Adrer <adrermail@gmail.com>
 2023-10-03 08:47:19 +02:00
Adrer
89214a1f59 Changes the roburger path to an existing path (#22614) 
Co-authored-by: Adrer <adrermail@gmail.com>
 2023-10-02 16:48:20 -05:00