cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-21 15:51:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,379 Commits 26 Branches 2 Tags
a3eee4b6cb045c2c2b51b757387c489bf13b8b04
Commit Graph

23146 Commits

Author SHA1 Message Date
Leanfrog
a3eee4b6cb Armor + Loadout 2021-06-06 13:01:47 -04:00
Fox McCloud
1b65d50424 Merge pull request #15903 from AffectedArc07/mysql-fix-v-234243 
Fixes character saving. Again.
 2021-05-09 12:28:17 -04:00
AffectedArc07
972b80e34c oops 2021-05-09 16:15:17 +00: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
TwoCam
0aec0f4725 Removed someone's old email from the code (#16000) 
* removed someone's old email from the code

* Update code/modules/newscaster/obj/newspaper.dm

Accepting AffectedArc07's suggestion.

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

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2021-05-08 22:08:47 +01:00
Farie82
f8966c92f4 Fixes a minor runtime when double opening observe (#15997) 2021-05-07 09:01:37 +01:00
AffectedArc07
281c72fbcc Who & Adminwho improvements (#15855) 
* Who & Adminwho improvements

* Mochi tweaks

* Sabre tweaks
 2021-05-04 21:43:05 -04:00
Stokes52
8c20b0aef2 Adds new security laser sprites and flavor examine descriptions (#15871) 
* Add new security laser and energy gun sprites with flavorful descriptions

* Fix the tesla revolver ammo sprite while I'm here

* Change 1s and 0s to TRUE and FALSE

* fix flashlight x offset and remove unused ammo offset

* remove green flashing lights

* remove green flashing lights from hand sprites
 2021-05-04 21:39:54 -04:00
Pidgey
e444ecbf97 Added Wasabi - a pungent spice found in basic nettles. (#15870) 2021-05-04 21:38:56 -04:00
LiberatedWaveMan
3b0e91892c Adds New IPC Screen Faces (#15942) 2021-05-02 15:45:22 +01:00
SabreML
6481a50506 'Do Not Revive' verb for Ghosts (#15934) 
* DNR

* Review things

Bound to be something I missed, but testing all seems to work fine.

* Aliven't
 2021-05-02 15:42:56 +01:00
Dragonkiller93
66ba2758f3 Borer preference affects notification (#15948) 
* Borer preference affects notification

* Update code/game/gamemodes/miniantags/borer/borer.dm

Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>

* Update code/modules/mob/mob_helpers.dm

Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>

* Update code/modules/mob/mob_helpers.dm

Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>

* Fix ambiguous or operator

Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
 2021-04-29 12:47:43 +01:00
Pidgey
96ca2f826c Neither shields nor containment fields can be irradiated anymore. (#15940) 2021-04-25 15:07:54 +01:00
dearmochi
31a5d28db9 Fixes handheld chem dispenser reaching negative charge (#15933) 2021-04-25 15:00:00 +01:00
LordShekelstein
1453c244e5 Gives Greys FluoroSulphuric Acid immunity (#15909) 
* Fixes Gloves of the North Star exploit.

* Update miscellaneous.dm

* Update miscellaneous.dm

* Create miscellaneous.dm

* Update code/modules/clothing/gloves/miscellaneous.dm

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

* Update code/modules/clothing/gloves/miscellaneous.dm

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

* commit on 'master'

* commit on 'master'

* master

* 'singularityhammer'

* commit

* adds !isgray to facid

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2021-04-22 21:36:00 +01:00
ppi13
9a582679f1 Gives ERT Combat Gloves (#15879) 
* Gives ERT Combat Gloves

* Removes pasta
 2021-04-20 21:50:17 +01: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
Sirryan2002
3a12a54f20 Adds Ice to Daiquiri recipe (#15910) 
* Adds Water to Daiquiri recipe

* fixing the recipe again

changes water to ice to prevent conflicts with grog (rum & water)

* Update code/modules/reagents/chemistry/recipes/drinks.dm

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

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2021-04-19 12:27:54 +01:00
Dragonkiller93
9bccec903b Fixes: Preferences now properly loads the UI style. (#15906) 
* Preferences now properly saves the UI style.

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

Adds spaces for easier reading.

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

Co-authored-by: Iwanabeu <35479849+Kineticinferno@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2021-04-18 11:41:39 +01:00
AffectedArc07
3afa925cfa Fixes character saving. Again. 2021-04-17 15:29:14 +01:00
Dennis
b151dfb0b9 Fixed a grammar mistake in the coroners cap description. (#15897) 
* Fixed grammar mistake.

* fix stupidity
 2021-04-17 13:48:17 +01:00
SabreML
6eb6747980 Allows Ian to eat homework (#15786) 
* Dog food V1

* m

* Fixed string

* Review thing
 2021-04-17 13:45:40 +01:00
SabreML
0eaec89adb Soup Drinking (and custom soups!) (#15620) 
* SOUP

* Space stuff

it compiled before I swear

* =
 2021-04-15 22:04:24 +01:00
SabreML
4b80316aea Makes Drones and Swarmers unaffected by radiation (#15569) 
* Safety Drones

* Just Drones and Swarmers

* Corrected version

Also cleaned up some swarmer vars
 2021-04-15 14:13:20 +01:00
dearmochi
71ddf21925 Adds volume channel for engine ambience (SM, Tesla) (#15845) 2021-04-10 12:10:22 +01:00
Dennis
13512ba21a Added mutatelist = list() to onion/red (#15858) 2021-04-09 18:05:25 +01:00
SabreML
9a95d16502 Fixes loadout errors appearing on every round (#15861) 
* Single letter PR

* Runtimes
 2021-04-09 16:10:24 +01:00
Dennis
1ae84f79f2 Moved nullified to own proc and reduced stacking effect of nullrod/prayer beads (#15809) 
* Moved nullified to own proc and reduced stacking

* Fixed minor error.
 2021-04-06 13:58:36 +01:00
SabreML
b58fb29ec9 DIY Transformation Sting (#15821) 2021-04-06 13:58:07 +01:00
SabreML
da47c96e4f Prescription (#15827) 2021-04-06 13:57:19 +01:00
Ionward
9f70667f9d Adds missing Vox sprites for Leather Overcoats and Retro Spacesuit (#15831) 
* adds missing Vox sprites for Leather Overcoats and the retro spacesuit

* made retro space suit actually use the vox specific sprite and made slight color adjustments
 2021-04-06 13:55:56 +01:00
Qwertytoforty
21cd566cca :trollface: (#15797) 2021-04-05 17:51:05 +01:00
Dennis
b719a2d772 Evidence bag items now call pickup proc (#15810) 2021-04-05 17:50:33 +01:00
Vallidian
82194574f5 SM Delam station wide siren (#15758) 
* SM Delam station wide siren

Adds some fluff to the SM when it hits 0 integrity. Sounds a global siren signifying a "meltdown" or delam is imminent.

🆑
add: adds a global siren shortly before delam.
/🆑

* Adding zlevel check for alarm

Thank you hal9000 and kyet for helping :)

Co-authored-by: Kyep <16434066+Kyep@users.noreply.github.com>

Co-authored-by: Kyep <16434066+Kyep@users.noreply.github.com>
 2021-04-05 17:49:27 +01:00
Kyep
2d99aeb72e update suggested client version to 513.1542 (#15744) 
Co-authored-by: Kyep <Kyep@users.noreply.github.com>
 2021-04-05 17:48:41 +01:00
Qwertytoforty
e2793017bc preventions and fixes (#15726) 2021-04-05 17:46:43 +01:00
warriorstar-orion
ea38c69633 Support 28 additional hats for corgis. (#15669) 
- /obj/item/clothing/head/HoS
- /obj/item/clothing/head/HoS/beret
- /obj/item/clothing/head/beret/sec
- /obj/item/clothing/head/bowlerhat
- /obj/item/clothing/head/caphat/parade
- /obj/item/clothing/head/hardhat/dblue
- /obj/item/clothing/head/hardhat/orange
- /obj/item/clothing/head/hardhat/red
- /obj/item/clothing/head/helmet/roman
- /obj/item/clothing/head/justice_wig
- /obj/item/clothing/head/soft/black
- /obj/item/clothing/head/soft/blue
- /obj/item/clothing/head/soft/green
- /obj/item/clothing/head/soft/grey
- /obj/item/clothing/head/soft/mime
- /obj/item/clothing/head/soft/purple
- /obj/item/clothing/head/soft/rainbow
- /obj/item/clothing/head/soft/red
- /obj/item/clothing/head/soft/sec
- /obj/item/clothing/head/soft/yellow
- /obj/item/clothing/head/surgery/black
- /obj/item/clothing/head/surgery/blue
- /obj/item/clothing/head/surgery/green
- /obj/item/clothing/head/surgery/purple
- /obj/item/clothing/head/wizard/black
- /obj/item/clothing/head/wizard/magus
- /obj/item/clothing/head/wizard/marisa
- /obj/item/reagent_containers/glass/bucket
 2021-04-05 17:44:51 +01:00
Ume
ee8464cafe Fixes dream text (#15784) 
The previous [DREAMER] text during dreams and nightmares is replaced with the character's name.

Co-authored-by: Ume <Ume-D@users.noreply.github.com>
 2021-04-05 15:58:14 +01:00
Ryal
93a0f58f21 Honkbot tweaks (#15808) 2021-04-05 15:56:57 +01:00
Sean Williams
08df09afb8 Cuffs now block arm implant use (#15825) 
* no more implant interaction with cuffs

* delete pascal case
 2021-04-05 15:49:35 +01:00
Adrer
4602b84d33 Diona/unbreakable limbs now properly augment children (#15826) 
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
 2021-04-05 15:47:20 +01:00
hal9000PR
d0afb01509 This is probably important (#15800) 2021-04-01 19:25:04 +01:00
hal9000PR
0f4e4530a9 Gives plasmaman and skeleton an emote to rattle their bones. (#15752) 
* squish

* doot doot
 2021-03-31 19:46:50 +01:00
Adrer
53399ff87f Make RND machines check for upgraded parts when checking if an item is constructable (#15753) 
* Protolathe design buildability check efficiency

* Efficiency_coeff rounding error fix

Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
 2021-03-31 19:46:15 +01:00
LordShekelstein
dc08268e67 Fixes Gloves of the North Star exploit. (#15762) 
* Fixes Gloves of the North Star exploit.

* Update miscellaneous.dm

* Update miscellaneous.dm

* Create miscellaneous.dm

* Update code/modules/clothing/gloves/miscellaneous.dm

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

* Update code/modules/clothing/gloves/miscellaneous.dm

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

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2021-03-31 19:37:58 +01:00
Kyep
46144e3c07 Syndie Space Base (#15104) 
* v1

* v2, floors

* more tweaks

* areas, powernet

* cleanup

* changed filename, added east wing, 6 slots

* syndi autolathe

* update ruins refs & config, delete comms agent

* IDs look properly syndie, names are randomized

* glass

* convert map file to TG map format

* del old file

* air alarms

* del navconsole, fix area tile

* AA request

* refactor

* AA requests II

* dorms symmetry

* deletes explosive plastitanium walls & self destruct device (from lavabase)

* add light to medical operating table

* atmos refill connectors

* add air canister and move meter in distro, add 2 portable air pumps

* improved vents

* tweaks pipes

* removes duplicate air alarm

* (PR req) replace areas/lathe/spawners with PR versions

* wrench, tele area icon, headset name

* player panel fix, replace /anyone ID with /researcher ID, ID.untrackable refactor

* fixes teleporter runtime

* "Syndicate Researcher" consistency

* cryo room

* delete syndiwrath

* default job on ID card for telecomms purposes

* add vents and airlocks

* air alarms toggle firelocks

* artvend

* trashbags

* revert alarm.dm

* delete rogue light

* update syndi lathe name, remove newscaster frame

* changes made necessary by atmos/redcross PRs

* fixes merge conflict

* update to fix conflicts with PR 15384 as well

* syndi teleporter now requires SYNDI_LEADER access, no more runtimes

* avoids making offstation cryopods always face right

* add scrubber net

* dmm2tgm

Co-authored-by: Kyep <Kyep@users.noreply.github.com>
 2021-03-30 18:54:19 +01:00
Sean Williams
c0d07bb627 shotguns now go off in your face upon sawing (#15772) 2021-03-30 16:15:47 +01:00
E-MonaRhg
6d06dc97a4 Clothing grammar tweaks and the such (#15761) 
* Clothing grammar and the such

* Made the PR more \improper and other stuff

* Suggested stuff

* Removed 's where it made sense

There are more most likely
 2021-03-30 12:27:55 +01:00
dearmochi
275d10ca7c Removes var/ from power_restore() def (#15770) 2021-03-30 12:21:20 +01:00
Fox McCloud
4e13913d39 TG Sprite Project: R&D, Mechfabs, Telecomms, and Station Objects (#15681) 
* TG Sprite Project: R&D, Mechfabs, Telecomms, and Station Objects

* tweaks

* other sprite
 2021-03-30 12:11:39 +01:00