cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-30 12:13:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,454 Commits 26 Branches 2 Tags
400a25dc01311201e8bc5fc7da667ba1e18a2999
Commit Graph

23187 Commits

Author SHA1 Message Date
AffectedArc07
400a25dc01 System configuration 2021-05-16 16:03:33 +01:00
AffectedArc07
7a3d535132 Vote configuration 2021-05-16 15:45:52 +01:00
AffectedArc07
c7fd6681a1 Gamemode configuration 2021-05-16 15:15:05 +01:00
AffectedArc07
f259500810 The events system is garbage. 2021-05-16 14:31:50 +01:00
AffectedArc07
f728993007 Merge remote-tracking branch 'ParadiseSS13/master' into toml-config 2021-05-16 13:22:14 +01:00
S34N
ae6f6148c2 Solgov tweaks (#15896) 
* marines, solgov, and more!

* belts are belts

* forgot da hat

* swapped guns around, loadout hat no longer strong

* Update code/datums/outfits/outfit_admin.dm

* updated shading on uniforms

* yeets a null entry

* gas masks, flipped caps

* renamed gas masks

* merge conflicts

* dmi conflicts confuse me

* ARG mag update
 2021-05-16 11:38:16 +01:00
SabreML
d2181a89bf Adds wiki links to antag greeting messages (#15939) 
* Wiki Links Pass 1

* Wiki Links Pass 2

Ash Walkers,
Terror Spider spawns,
Terror Spider event,
Construct transfer,
Xenomorphs

* Less hardcoding
 2021-05-16 11:36:26 +01:00
SabreML
3d6e072464 A lot more Cult fixes (#15161) 
* Some fixes

1: ERT members can no longer be given as an assassinate/sacrifice antag objective.
2. Cultists attempting to teleport to a deleted rune will no longer be teleported into nullspace.
3. Re-ordered the cult Blood Rites spell code because it was bugging me. (sorry qwerty)

* Cult stuff

1: Cultists can no longer be chosen as a sacrifice target
2: Rune drawing is limited to one at a time (No spamming on one tile)
3: Removed some unneccesary `/improper`s from area names, for the cult Summoning locations
4: Changed a couple of colours to use defines

* QDELETED()

* Eye colour fix

* Reorganisation, Objectives, and Gender

The majority of the changes here are just reordering the procs, but there's a few fixes too:

1. Roundstart cultists now get given the 'servecult' objective.
2. Deconverting someone now removes their 'servecult' objective, so they won't be notified about target changes.
3. Stopped summoned ghosts from experiencing a spontaneous gender change.

* Screwdriver fix

* Prayer bead stripping

* Some more construct fixes

1: Fixed *all* holy constructs getting the 'Summon soulstone' ability
2: Fixed Wraiths getting their blue light reset to red after jaunting
3: Added a 'holy' variable to constructs, and made the holyification its own proc.

* qdeleted

* Construct Converting

Apparently you can convert holy constructs. Who knew!

* Another two weeks

Moved all the construct icon states to their own file, and fixed Nar'Sie constructs not getting a glowing effect.

* Grab fix

Fixed upgrading a grab having the ability to potentially transport the victim across dimensions.

* Not actually a cult fix but eh

Fixes: Runtime in outfit.dm, 114: bad number
And updates the cult corpse from legion spawns

* Teleport spell effect

Fixed the teleport effect for the spell being attached to the wrong mob.

* Small cleanup

* Eye colour cloning fix

* Veil Shifter

Fixed:
Runtime in cult_items.dm,355: pick() from empty list
Veil shifters not retaining any grabs after teleporting.

* Adjacent
 2021-05-16 11:33:07 +01:00
hal9000PR
9c4b73be1e Fixes self surgery with beds (#16004) 
* fix

* mochi's suggestion. added check for self surgery starting

* line
 2021-05-16 09:37:25 +01:00
S34N
509c1d5638 Fixes rogue characters on strip menu (#16009) 2021-05-16 09:35:00 +01:00
SabreML
e405d165d3 QM for Head 2021 (#15982) 2021-05-16 09:34:02 +01:00
AffectedArc07
cc3d81df96 Server Update Update 2021-05-15 20:28:08 +01:00
Fox McCloud
bc41d93f36 Merge pull request #15811 from AffectedArc07/reagent-container-anchoring 
Allows anchoring of fueltanks/watertanks/etc
 2021-05-15 11:05:22 -04:00
Fox McCloud
6eeb10b441 Merge pull request #15725 from dearmochi/eyes-default-lighting-alpha 
Give eyes default lighting alpha of LIGHTING_PLANE_ALPHA_VISIBLE
 2021-05-15 10:49:12 -04:00
Fox McCloud
d13b407646 Merge pull request #15885 from S34NW/tginhands 
Ports /TG/ shotgun inhand sprites, adds custom ones
 2021-05-15 10:47:01 -04:00
Fox McCloud
6c6b1b53f0 Merge pull request #15815 from datlo/heat-resist-fix 
Make the heat resistance trait fully fireproof
 2021-05-15 10:37:34 -04:00
Fox McCloud
f76efc8f73 Merge pull request #15863 from ppi13/look-maa-i-can-fit-8-crayons-up-my-nose 
Adds the Elusive Black crayon
 2021-05-15 10:31:22 -04:00
Fox McCloud
3b2da56ab7 Merge pull request #15970 from Dragonkiller93/Dizziness_tick_fix 
Removes duplicate code from handle_status_effects
 2021-05-15 10:23:22 -04:00
Fox McCloud
a2057998f7 Merge pull request #15996 from farie82/genes-optimization 
Optimizes handle_mutations_and_radiation. No more looping 55 times per human to do nothing
 2021-05-15 10:13:31 -04:00
Dragonkiller93
95fd71989c Did a copy paste wrong. 
Thanks dearmochi for the fix.

Co-authored-by: dearmochi <shenesis@gmail.com>
 2021-05-12 14:13:39 -07:00
Iwanabeu
b321d278d9 Adds the code back to carbon/life and removes it from human. 2021-05-11 14:10:06 -07:00
Iwanabeu
24704f205c Removes unneeded variable restingpwr. 2021-05-10 15:49:07 -07: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
joep van der velden
dbb153339f Optmizes handle_mutations_and_radiation 
Saving about 90% CPU power on blank humanoids
 2021-05-06 22:36:51 +02:00
AffectedArc07
05f4ce1199 Merge branch 'master' into toml-config 2021-05-05 10:36:10 +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
AffectedArc07
12acc7a300 Overflow configuration 2021-05-04 12:34:37 +01:00
AffectedArc07
bf80b1ab00 Gateway configuration 2021-05-04 12:06:27 +01:00
AffectedArc07
bf93b5bf6f Logging configuration 2021-05-03 20:54:36 +01:00
AffectedArc07
445726812e Jobs configuration 2021-05-03 20:34:51 +01:00
AffectedArc07
34e46807e9 MC Configuration 2021-05-03 19:32:16 +01:00
AffectedArc07
29af4068f2 CI debugging woooo 2021-05-03 18:26:30 +01:00
AffectedArc07
9ac84b241f Converts configs to use TOML 2021-05-03 18:12:42 +01: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
Iwanabeu
6400e8ff75 Removes duplicate code from handle_status_effects 2021-05-01 13:28:14 -07: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