cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-03 06:01:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
55,157 Commits 26 Branches 2 Tags
5e964fa9fcb7d4dd0d3e6a809fab3aa83d416d78
Commit Graph

25063 Commits

Author SHA1 Message Date
Henri215
5e964fa9fc Video camera tweaks (#19481) 
* video camera tweaks and added to protolathe

* sprites

* you must wield it to use now

* Edan52 review and use of if(wielded)

* Back to one hand

* conflict

* sprites

* hahaha

* mistake fixed

* visible message, librarian camera and tweak to desc

* little tweak to desc

* Steelslayer review
 2022-11-26 12:10:15 -06:00
Farie82
1ba7e14fc2 Adds Blob burst status effect to both blob mice and humans (#19678) 
* Add blob burst status effect to mouse and human

* Mouse cleanup

* Blob code refactors

* Change description

* Undo testing changes

* fix final stage

* Better map text. Thanks to Vi3trice

* Update code/datums/status_effects/blob_burst.dm

Co-authored-by: Vi3trice <80771500+Vi3trice@users.noreply.github.com>

* Update code/game/gamemodes/blob/blob.dm

* Duration fix + potential GC fix

* Update code/game/gamemodes/blob/blob.dm

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

Co-authored-by: Vi3trice <80771500+Vi3trice@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
 2022-11-26 15:41:48 +00:00
Contrabang
57af3821fa Fixes APCs being immune from explosion and tesla destruction (#19742) 
* apc-fixes

* sirryan review
 2022-11-26 00:09:42 -06:00
Luc
1490f60819 Adds new emote keybinds, and emote keybind unit tests (#19603) 
* Adds a keybinding for *crack

* Add new unit tests

* Fix up unit tests

* oops, this wasn't supposed to make it in

* Update code/modules/unit_tests/emotes.dm

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

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2022-11-25 23:01:31 -06:00
Henri215
dfb85e6460 Preparing for the summer: baseball and dodgeballs! (#19627) 
* welcome to the space jam

* Apply suggestions from code review

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

* review suggestions

* conflict solve mistake

* Apply suggestions from code review

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

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

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

* Apply suggestions from code review

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

* wear suit check

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
 2022-11-25 22:50:17 -06:00
FloFluoro
5912278a08 ATMs can now be cmagged (#19762) 2022-11-25 21:13:00 +01:00
Henri215
baf269ac16 Supply packs tweaks (#19751) 
* supply packs tweaks

* removed by mistake

* ops

* wizard costume added to costume crate

* added back beekeeper suit crate

* removed bottler crate
 2022-11-25 21:11:20 +01:00
Adri
0d415c1ec6 Adds croissant (#19770) 2022-11-25 21:07:43 +01:00
Qwertytoforty
f27fdd9dcd fixes crusher trophy misspelling (#19765) 2022-11-24 19:22:19 -05:00
Coolrune206
892dcd1ca4 Gives Alien Queen (and Empress) bold text in Alien Hivemind (#19761) 
* gives loudspeaker to Alien Empress and Queen

* Sirryan review

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

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
 2022-11-24 19:21:28 -05:00
AzuleUtama
bfdeb87aed Merged forcewall and greater forcewall into a single spell (#19739) 2022-11-24 22:52:24 +01:00
Qwertytoforty
3e7684ad20 puts the name of the GPS fired on by BSA in the message admins (#19735) 
* puts the name of the GPS fired on by BSA in the message admins

* Update code/modules/station_goals/bsa.dm

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

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2022-11-24 22:51:08 +01:00
Coolrune206
c4a9044ad3 Fixes the syndie multitool tech origin, adds unit test for origin tech (#19729) 
* fixes the syndie multitool tech origin, I am god

* someone didn't know how origin_tech worked heh

* I dunno what this is but AA wanted it

* Revert "I dunno what this is but AA wanted it"

This reverts commit 073dc5b8b5.

* maybe this-a-work?

* Revert "maybe this-a-work?"

This reverts commit 6b9b4a43a1.

* Affected Arc, more like Affected Arc

* WILL, THIS, WORK?

* amogus

* I'm a genius

* Warriorstar request
 2022-11-24 22:47:24 +01:00
Christasmurf
db6b994911 Bomber jacket loadout changes - Job subtypes and adds engi/atmos to loadout options (#19723) 
* loadout options

* bomber job subtype changes

* display name consistency

* spacing aaaaaaa
 2022-11-24 22:46:01 +01:00
GDN
da8622cfd3 Lets lizards move under doors while hidden (#19721) 2022-11-24 22:44:20 +01:00
Coolrune206
1a2ab9e6a1 gives some info about how headslugs work (#19741) 2022-11-23 22:23:31 -06:00
GDN
400fd63068 Converts lavaland /random mobs to landmarks (#19523) 
* Lavaland /random mob refactor

* Update landmarks.dm

* Handles stuff on parent level

* steel's review

* this is a certified byond moment

* Code improvement via ryan
 2022-11-23 20:53:15 -06:00
Henri215
833841ec6d Tajaran, Unathi and Vulpkanin can now eat bees! (#19663) 
* whos crazy enough to eat bees?!

* examine text tweak

* Update code/modules/mob/mob_grab.dm

Co-authored-by: Coolrune206 <71326864+Coolrune206@users.noreply.github.com>

* facid for syndiebee

* moved examine text

* message tweak 2

* Apply suggestions from code review

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

* using bee reagent

Co-authored-by: Coolrune206 <71326864+Coolrune206@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2022-11-22 23:06:00 +01:00
ElorgRHG
08a9b19d19 Paradise's soul removal part 2.5: rest of security (#19522) 
* Security suit resprite

* Map in security variants of riot and bulletproof armors

* Security hats resprite

* Security belt and webbing resprite

* Blue warden by default because why not

* Very tiny (literally one pixel) tweak to the HoS trenchcoat

* Security riot suit in the name

* Small armor with badge oopsie

* Vox suit and hat variants

* Species variants of new security suits and helmets

* Deconflicted

* Deconflicted again

* Forgot about the warden's beret existance

* Deconflicted suits part two

* Blueshield armor too because it would look out of place otherwise

* Deconflicted belts

* Accidental duplicate I'll fix here
 2022-11-22 16:51:26 -05:00
Coolrune206
d4744d0d8d Converts clown mask selection to a radial menu (#19675) 
* converts clown mask selection to radial menu

* desc update

* Sirryan review

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

* Sirryan review pt2

* Reverting as it no longer builds

* Revert "Reverting as it no longer builds"

This reverts commit 56873c79b1.

* right everything should work now haha

* removed else, thanks Contra

* Sirryan request

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

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
 2022-11-21 22:53:15 -06:00
Henri215
615ae2db4e Adds wedding/costume/bloody armor crates and other tweaks (#19231) 
* adds wedding/costume crate and crates tweaks

* salmon suit was a mistake

* lowered armor cost and added monkey costume

* Update code/datums/supplypacks.dm

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

* forgot to include the hood

* deconflict part 2

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
 2022-11-21 22:43:54 -06:00
GDN
0139e03f54 Adds shed tail and eating bugs to simplemob lizards (#19726) 
* Adds shed tail and eating bugs to lizards

* Steel's review

* Steels review part 2

* Steel's and Charlie's review

* Ryan's review

* Early return code improvement

* minor spelling mistake
 2022-11-21 22:33:30 -06:00
ElorgRHG
8040e60736 Rejoice for the mankini has sprites again and drask can no longer be nazis! (#19609) 
* Rejoice for the the mankini has sprites again

* Cleans up and denazifies drask costumes file
 2022-11-21 22:14:56 -06:00
Qwertytoforty
b6b55848c8 adds 1 more radius to the arena teleport (#19738) 2022-11-21 21:24:03 -06:00
Sirryan2002
61145a02f8 [TGUI] Space Credit Economy Overhaul + Supply Point -> Space Cash (#19209) 
* initial edits

* initial edits

* converting shit over to machinery/economy

* vending and mapping fixes

* vending fix pt.2

* Converts Supply Economy to Use Space Credits instead of Supply Points

* Job Payment, NanoBank, and Paychecks

* clothing type path fixes (damn merge conflicts)

* fixes map typepath issues

* adjusts supply prices

* Vendor Price Adjustments

* account uplink terminal tweaks

* please pass tests

* Apply suggestions from code review

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

* reviews and bug fixes

* Review Suggestions/Fixes and Request Console Rewrite

* edits

* vending changes for merge

* typepath fix

* final tweaks

* proc ref fixes

* Fixes and Tweaks from 2nd TM

* rebuild TGUI

* final tweaks

* Apply suggestions from code review

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

* requested reviews

* tweaks

* updates slot machine winnings

* fixes

* GC fixes

* fixes

* oops. still need to deconflict this

* Apply suggestions from code review

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

* requested changes and bug fixes

* atm runtime fix

* requested reviews

* vend act stuff

* attempt to pass tests

* supply packs fix

* user tochat -> debug log

* FINAL FIXES

* removes CC db stuff

* Apply suggestions from code review

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

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2022-11-21 23:30:50 +00:00
AzuleUtama
ae8accb766 Terror spiders now have intro text (#19564) 
* Terror spiders now have intro text

* Some extra basic info, formatting changes

* converted intro to a proc, formatting and text changes

* SEAAAAAAN
 2022-11-20 23:19:34 +01:00
Adri
2bcbe77c48 Adds more accessible logging for opening harmful canisters (#19712) 
* Adds more accessible logging for opening harmful canisters

* Replaces usr with ui.user
 2022-11-18 18:18:50 -06:00
Henri215
11ab10468c ORM unfasten time 2 -> 6 SECONDS (#19715) 2022-11-18 18:14:27 -06:00
S34N
2a84d79616 Double-disabler fix (#19698) 2022-11-18 18:10:11 -06:00
Charlie
32ee23832c fixes shadow anchors getting destroyed (#19719) 2022-11-18 18:07:30 -06:00
McRamon
56b8b1ece4 Hawaiian loadout (#19685) 
* does this work?

* maybe this will work?

* fix

* dots of consistency

* removal of what was asked to be removed
 2022-11-18 20:40:09 +00:00
Contrabang
93b54294f1 refactor (#19714) 2022-11-17 20:40:43 +00:00
FloFluoro
93e92381a9 Cmagged objects now use the same define on ADD_TRAIT (#19718) 2022-11-17 21:06:49 +01:00
Coolrune206
cbdbf60f57 Makes the pet collar not an accessory. Remake remake of the revert of the revert. (#19644) 
* let's try this again

* who even named these variables

* Sirryan review

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

* removes as mob

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
 2022-11-17 17:31:51 +00:00
S34N
7dcd31990e Ports TCC style windows (#19488) 
* window

* fix plasma window and spawners

* this now works well

* Apply suggestions from code review

Co-authored-by: Edan <29551695+Edan52@users.noreply.github.com>

* Empty-Commit

* Empty-Commit

* colour tweaks

* further colour tweaks

* last tweak

* edges

* false wall sanity

* Update code/__DEFINES/icon_smoothing.dm

* stealth conflict begone

Co-authored-by: Edan <29551695+Edan52@users.noreply.github.com>
 2022-11-16 20:44:51 +00:00
S34N
536914eec6 shockproof carp (#19689) 2022-11-16 19:32:20 +00:00
Farie82
cad01936b6 Fix blackpowder reactions (#19709) 2022-11-15 21:40:06 -06:00
Stokes52
4f95faf2c8 Adds sprites for opening and closing the bolt when using a bolt action rifle (Mosin). (#19510) 
* Add sprites for mosin bolt opening and closing

* Bolt action code cleanup

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

* Fix missing bolt state

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2022-11-15 17:44:26 -06:00
S34N
b66fb2448c 515 compat 2, ./proc/ boogaloo (#19688) 
* 515 compat 2, ./proc/ boogaloo

* ASYNC

* further CI checks

* aa

* lol escape this / pls

* more of them

* no idea why but this is scuffed so
 2022-11-15 22:06:30 +01:00
Contrabang
47a2872371 nukes it (#19514) 2022-11-15 19:54:35 +00:00
Henri215
fc57d9fc61 Another buff to radio jammers (#19696) 
* jammer buff part 2

* 75 --> 70
 2022-11-15 19:44:46 +00:00
Contrabang
6161109bea Allows drones and mice to go under doors when hidden (#19633) 
* they go under

* how the fuck did I not push the flag itself

* farie review

* s34n review

* Revert "s34n review"

This reverts commit 572e689dd2.
 2022-11-15 19:56:29 +01:00
SteelSlayer
0a2190f3e1 give item GC fixes (#19686) 2022-11-15 19:46:14 +01:00
DevanStrife
05c8ce2cd5 Removes the deathgasp sound if one is muffled (#19465) 
* No deathgasp sound while muffled!

* Makes actual death still emit sound

* Lewcc requested changes

* Farie comment
 2022-11-15 12:01:01 +01:00
Nathan Winters
33e38a9a10 Fixes kitchen appliances partially sucking up ingredients when upgraded (#19641) 
* Spacing

* Fix kitchen machines sucking up ingredient reagents

* Minor comment update

* Minor readability tweak

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

* Minor readability tweak 2: Electric Boogaloo

* More spacing

* Sirryan review

* Cut out the middleman

* Comment cleanup

* Rightward drift my beloathed

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2022-11-13 21:53:55 +01:00
Henri215
5782866a00 balaclava can toggle again (#19671) 2022-11-12 08:54:03 +01:00
Livi
542671755d Meson eyes prevent supermatter hallucinations (#19551) 
* Meson eyes prevent supermatter hallucinations

* Made meson eyes give meson trait instead

* Code readability

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

* Adds UIDs to trait sources

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2022-11-12 08:50:29 +01:00
Charlie
421777b317 Reworks block chance into Parrying. (#19334) 
* parry component

* converts block chance to parry components

* armour pen, katana fix, pickup fix

* melee parry fix

* removes perfect parries, tweaks armour pen calc

* SIGNAL_HANDLER

* fix

* resist fix

* reduces parry time out time, increases cooldown

* Apply suggestions from code review

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

* fix

* cooldown rebalance

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2022-11-12 08:49:44 +01:00
warriorstar-orion
8679d130bb Announcements Refactor Day 1 Patch. (#19595) 
* Announcements Refactor Day 1 Patch.

- Fix formatting of AI Announcement when TTS disabled
- Fix announcements not respecting chatlog font size preference
- Adjust margins and font-sizes of announcements to make them a more
  reasonable size
- Fix missing sounds when raising security levels
- Fix AI Announcement missing notification sound

* Style cleanups

* Add alert class back.

* Final final touches

* More spacing fixes
 2022-11-11 20:18:34 +01:00
ElorgRHG
6a9f223fda Paradise's soul removal part 6: Syndicate turtlenecks (#19594) 
* Syndicate under/turtleneck resprite, combat uniform sprites

* Vox variants
 2022-11-11 20:13:31 +01:00