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

26117 Commits

Author SHA1 Message Date
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
Fox McCloud
3b3082c844 Garbage Collector Update (#22428) 
* Garbage Collector Update

* doc
 2023-10-02 20:10:32 +01:00
matttheficus
9d0c74b687 Removes Bluespace Tile Speed, Replaces It With Anti-Slowdown (#22271) 
* the start

* gear slowdown time

* nicer check

* trait time!

* dimach + henri review

* contra review

* sean review
 2023-10-01 17:41:09 +01:00
DGamerL
ac385bdf5d Stops you from grabbing someone if you are horizontal (#22563) 
* Gotcha! Oh wait-

* Update code/modules/mob/living/living_defense.dm

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

* Works for now, oculd use a cleanup later

* Nice it works

* Contra review

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2023-10-01 16:20:18 +01:00
GDN
2d76b2117f Moves the lobby panel to the status panel (#22596) 2023-10-01 14:40:29 +01:00
Furior
7b02971f32 Fix/Tweak: Now admin logout messages are more important than mentor ones (#22560) 
* Dunno

* oops
 2023-10-01 14:31:29 +01:00
Luc
f35ac06d66 Modsuit flashlights are now properly extinguished (#22557) 
* pREVE

* No more force
 2023-10-01 14:25:58 +01:00
Octus
792ad7b904 Updates Sprite on Vox Breath Mask (#22422) 
* updates mask

* fixes qwerty's concern

* recolor/better shade

* less phallus looking

* cleans a dupe

* new mask resprite thanks to McRamon
 2023-10-01 14:21:46 +01:00
Contrabang
7e0aa47311 Refactors objectives, expands team functionality, and custom teams (#22374) 
* step 1

* renaming 1

* how could I forget this

* renaming 2

* renaming 3

* add matching proc, even if unused can remove later

* rename team obj to match

* oops

* okay more stuff

* okay more stuff

* fix this stuff

* okay more stuff

* needs_target = FALSE

* OKAY MORE STUFF

* OOPS AGAIN.

* self-review

* more round_end stuff

* stuff 119

* yeah fix that too

* EVEN MORE CHANGES

* grammar

* fix

* s34n review

* fixes custom teams with no antags not showing objs

* makes objectives work properly with teams

* a
 2023-10-01 14:14:10 +01:00
Octus
2bdd9397aa Removes Pet Hospital, Adds Althland Corporation Refinery Ruins (#22287) 
* byebyepet

* typo fix

* more typo fixes

* fixes

* another fix

* delete hospital shit

* ok seriously work now you fuc-

* improvements

* changes tempature

* heat proof lattice

* hi qwerty

* test

* ok lmao

* lattice moment

* oopsie!

* ok fuck you

* map update

* yes

* Revert "yes"

This reverts commit 9892a11232.

* Update lavaland_surface_althland_facility.dmm

* Update code/game/objects/items/stacks/rods.dm

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

* henri review

* adds lore

* fix

* fix

* more fix

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2023-10-01 12:24:43 +01:00
Sadhorizon
dfd13270e9 Adds a new fauna to lavaland: an abandoned minebot! (#22173) 
* added the file

* works pretty nicely

* forgot these comments

* doubled their spawn chance

* minebot passthrough stuff

* more fluff

* no longer will go to lava tiles

* answered most reviews

* DGL's solution

* makes loot more efficient, minor tweaks
big thanks to DGamer with this one!

* DGL's review

* Update code/modules/mob/living/simple_animal/hostile/mining/abandoned_minebot.dm

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

* Merge remote-tracking branch 'upstream/master' into outpost_remap_copy

* oops, a lil fuckup

* removes an unneeded var

* removed the landmark iconstate

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2023-10-01 12:12:11 +01:00
HMBGERDO
9ecfd05267 Parallax in Darkness (#22136) 
* you can now see parallax in darkness

* moved parallax_darkness to toggles2

* uh oh

* one more thing

* total value

* Update code/modules/client/preference/link_processing.dm

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

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2023-10-01 12:06:08 +01:00
Henri215
85d8aeee96 Nt recruiter First DLC (emag and other tweaks) (#22427) 
* New NT Recruiter update

* Adding emag effect for the arcade + other tweaks

* tickets for reward too

* ops

* Medal prize!

* adding sounds when losing!

* increasing minimum bad max age

* added small interaction cooldown

* adjusting time

* tgui rebuild

* ah shit, here we go again

* tgui rebuild

* lets fix this

* Apply suggestions from code review

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

* tgui rebuild

* tgui rebuild

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2023-10-01 11:49:24 +01:00
meow20
5d538fb466 Syndicate bots no longer show up on security bot control PDA menu (#22602) 
* technically first commit

* nt ed's now show up and linter check should pass.
 2023-10-01 11:48:58 +01:00
Contrabang
c78e1aeb8f adofiwefwoeiunf (#22593) 2023-10-01 11:48:24 +01:00
DGamerL
4c976a6e01 Splits up item_inhands.dmi (#22584) 
* AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

* Fixes jackhammer and glass shard

* Fixes toy Chainsaw

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

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

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

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

* Update code/modules/antagonists/vampire/vampire_powers/hemomancer_powers.dm

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

* Fixes edagger hopefully

* Henri review

* Oops

* First this gone, and now the pain

* Should all be fixed now

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2023-10-01 11:47:25 +01:00
Henri215
931c36fcfb Some fake virus tweaks (#22591) 
* Some fake virus tweaks

* renaming some vars
 2023-10-01 11:43:08 +01:00
Luc
c8456810d8 marks cap guns as harmless (#22572) 2023-10-01 11:42:47 +01:00
Luc
e757638648 Kills Check Pulse (#22501) 
* unchecks verbs

* removes method
 2023-10-01 11:41:39 +01:00
Henri215
e0002c620f Fixes the motorcycle overlay (#22628) 2023-09-30 14:38:36 +01:00
Bjamcham
26bc079d25 This seems bad (#22631) 2023-09-30 14:36:20 +01:00
1080pCat
730897d29e Ghosts are now able to see N2O with the analyze air verb. (#22552) 
* Update observer_base.dm

* Burzah review

* missed a  couple

* Update observer_base.dm

* Update observer_base.dm

* Update observer_base.dm

* Update observer_base.dm
 2023-09-30 08:40:20 -04:00
meow20
1e15d92667 Fixes silicons from being unable to pick up cells from cell chargers (#22581) 
* fixes silicons from being unable to pick up cells from cell chargers

* add a space, as with the convention.

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

* Update code/modules/mob/living/silicon/robot/drone/drone_items.dm

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

* Update code/modules/mob/living/silicon/robot/drone/drone_items.dm

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

* Update code/modules/mob/living/silicon/robot/drone/drone_items.dm

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

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2023-09-30 08:38:02 -04:00
Contrabang
dd9837401b Reading books can help decrease brain damage (#22582) 
* librarian has a purpose now

* i forgot to push this

* lewc review
 2023-09-30 08:37:49 -04:00
BiancaWilkson
bee378f52a Fixes some typos (#22583) 
* list time

* just for you qwerty
 2023-09-30 08:36:54 -04:00
K3Licia
8b91ee45d7 pAI Manifest / Messager Default Software (#22586) 
* Add files via upload

* Delete icons/mob/sprite_accessories/tajaran directory

* Delete code/modules/mob/living/silicon/pai/software/pai_apps.dm

* Add files via upload

* fixing this up

* Revert "fixing this up"

This reverts commit a05fa332c5.

* i am clinically insane

* Delete icons/mob/human_races/r_tajaran.dmi

* please be normal
 2023-09-30 08:36:42 -04:00
dearmochi
ea93d78402 Fix death by brain damage spamming message (#22587) 
* Fix death by brain damage message being spammed

* chore: remove redundant message
 2023-09-30 08:35:49 -04:00
DGamerL
7b15c3f60b Fixes projectiles passing through the Desecrated Duel arena (#22588) 
* Fixy fixy

* Make it not affect lavaland elites

* Update code/modules/mob/living/simple_animal/hostile/mining/elites/elite.dm

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

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2023-09-30 08:26:10 -04:00
GDN
97debc25b2 fixes a to_chat runtime (#22646) 2023-09-30 12:58:37 +01:00
Adrer
d1d27ae5fa Fix energy gun descriptions (#22647) 
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
 2023-09-30 12:56:47 +01:00
Furior
846301b47b Ref: ifdefs to previously ifdenined thing (#22562) 2023-09-28 19:33:38 -04:00
matttheficus
00b6246b46 time to one-hand execute some nerds (#22559) 2023-09-28 19:33:15 -04:00
Henri215
dfe6a99e5e Fixes some issues with soft caps (#22541) 2023-09-28 19:32:12 -04:00