cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-28 11:11:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,598 Commits 26 Branches 2 Tags
ba8052af3fb4e973a036a14c19d040db78209f6a
Commit Graph

23253 Commits

Author SHA1 Message Date
warior4356
ba8052af3f Apply suggestions from code review 
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2021-07-15 18:44:23 -07:00
warior4356
15b32b7283 Merge branch 'master' into holy-chapel 2021-07-05 18:12:02 -07:00
SteelSlayer
7c505d93d9 Fixes a couple things related to miner borg upgrades and kinetic accelerator modkits (#16306) 
* miner borg upgrade fix

* re-add check
 2021-07-05 19:18:20 +01:00
S34N
22b83565d2 damn rogue characters (#16309) 2021-07-05 18:28:18 +01:00
Qwertytoforty
6121d42776 Makes chameleon belt have the same name / desc as a tool belt (#16290) 2021-07-03 11:23:29 +01:00
Qwertytoforty
1b1f49ac81 Adds the Emergency Extraction Flare (#16220) 
* Adds the Emergency Extraction Flare

* removes extra message

* Apply suggestions from code review

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

* Apply suggestions from code review

Co-authored-by: dearmochi <shenesis@gmail.com>

* All I ever get, is a pain in the ash... 🎵

* Affecteds requests part 1

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

* Use populate_contents

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

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

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: dearmochi <shenesis@gmail.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2021-07-02 21:32:45 +01:00
Vallidian
5a0eafb0a8 Adds adminfreeze drink (#15976) 
* Adds adminfreeze drink

Adds a drink similar to Antifreeze called Adminfreeze as a bit of a meme. Requires an upgraded booze machine or a bottle of Nothing, ether from medbay, and some heat to create.
2 counts Vodka, 1 count Nothing, 1 count Ether.

* Removed BWOINK from taste description

Audio cue happens when mixed already.

* Updated adminfreeze drink

Changed sprite to not have the ADMIN on the side.
Changed the recipe to include a more difficult mixture.
1 count neuro-toxin, 1 count toxin special, 1 count fernet, 1 count moonshine, 1 count morphine

Adds a freeze effect and lowers body temp each sip.

Increased the alcohol percentage to 1.5 from .9

* reverted adminfreeze sprite to include ADMIN

After updating the recipe to make it harder to create, and popular opinion. Readded the ADMIN text to fully embrace the meme drink.
 2021-07-02 18:00:32 +01:00
Fox McCloud
d9d09deb00 Merge pull request #16212 from AffectedArc07/atom-rotation 
Better atom rotation
 2021-07-01 22:15:58 -04:00
Fox McCloud
fe24ce4d75 Merge pull request #16159 from AffectedArc07/new-player-gc-hopefully-please 
(Hopefully) makes new players GC
 2021-07-01 22:14:21 -04:00
AffectedArc07
516cd5d557 Improves new player GCR 2021-06-29 20:23:49 +01:00
Dragonkiller93
0690c3dddd EFTPOS code parcel now spawns in the chef's backpack. (#16034) 
* EFTPOS now spawns on the ground under the chef.

* Now spawns in the chef's backpack, thanks AA.

* Update code/modules/economy/EFTPOS.dm

Unneeded identifier.

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

* Now drops on floor if there is no backpack.

* Update code/modules/economy/EFTPOS.dm

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

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2021-06-29 11:50:06 +01:00
datlo
7de29bd81f Replace nukie jetpacks by oxygen tanks (#16101) 
* Replace nukie jetpack by oxy tanks

* replace all harnesses
 2021-06-29 11:46:43 +01:00
Qwertytoforty
bcb0cbe5cb Prevents built APCs from being hacked, Prevents AI from loosing points from apc destruction (#16192) 
* Prevents built APCs from being hacked, prevents deconstructing apcs from removing malf points

* Spacing

* whoops

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

* Affecteds other suggestions.

* Grammer changes

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

* And autodoc for steel

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

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2021-06-29 11:44:18 +01:00
Cocacolagua
9a21cf1d4b no more message (#16202) 2021-06-29 11:43:08 +01:00
melandor0
612bb0a3bb remove mouse ears (#16214) 
Mouse ears were originally the vanity/flair item made for me that somehow made their way into the autodrobe, then out of the autodrobe and into donator items. I'd like to reclaim my vanity item, and thus remove it from donor availability.
 2021-06-29 11:40:52 +01:00
meow20
1e9ed4c648 Let's labcoats store cyborg analyzers. (#16246) 
* Update labcoat.dm

* Update code/modules/clothing/suits/labcoat.dm

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

Co-authored-by: meow20 <meow20@onet.pl>
Co-authored-by: hal9000PR <69320440+hal9000PR@users.noreply.github.com>
 2021-06-29 11:34:26 +01:00
warior4356
aec95fed48 Merge branch 'master' into holy-chapel 2021-06-28 20:31:34 -07:00
SabreML
c266b27aed Another small bugfix bundle (#16260) 
* Closet examine

* Lit welder inhands

* Capitalisation

* Cyber organ eating

* Nukie reinforcements code

* Welding tool lathe cost

* Patch pack dropping

* Welding tool fix

* Spacing

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

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2021-06-26 22:57:27 +01:00
Qwertytoforty
d6f15657fe Fixes contractors removing ipc power cord (#16262) 2021-06-26 21:33:40 +01:00
AffectedArc07
9b86a42a3d Casing 2021-06-24 17:29:18 +01:00
SabreML
483f31e038 This was a lot simpler than I expected (#16230) 2021-06-22 10:42:48 +01:00
S34N
6b06ca3ef5 Ports HTML manifest to TGUI (#16210) 
* Ghost manifest is tgui now

* moved to tgui modules

* Delete crew_manifest.dm

* global

* ghost -> nologo

* sorry mr. tgui, i forgot about you again

* Jade review + more trimming

* lobby and silicons get some love

* bye bye, all traces of old manifest.

* renamed
 2021-06-21 12:21:32 +01:00
SabreML
0b375de42c Removes the the vast majority of 'The the' from the the code (#15597) 
* The the

* Some more

* Review 1

* A couple more
 2021-06-20 10:20:32 -04:00
AffectedArc07
066c61dccd Better atom rotation 2021-06-19 18:14:37 +01:00
Qwertytoforty
fb4cf6841c Fixes the descriptions so it doesn't make broke guns (#16207) 2021-06-19 14:12:25 +01:00
SabreML
dd02435095 Fixes secborg batons (#16196) 
* Cell linking

* V2
 2021-06-19 14:10:01 +01:00
Qwertytoforty
266e7c2dbf Prevents ablative armor from reflecting in hand (#16204) 
* Prevents ablative armor from reflecting in hand

* Update code/modules/clothing/suits/armor.dm

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

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2021-06-18 21:15:12 +01:00
Qwertytoforty
810a94e48b Prevents every gun under the sun from lying about alt skins (#16205) 2021-06-18 21:14:33 +01:00
Qwertytoforty
5fb2ccbcfc Rebalences teslium blob slightly (#16119) 
* part 1 of rework

* Finishes the rework for now

* Allows it to leave the body

* Makes it a proc
 2021-06-17 15:47:31 +01:00
Pidgey
f28e20af21 Anyone can now use the finger gun and fake finger gun spells. (#15941) 2021-06-17 10:40:35 +01:00
Lumi
11f6ca1cc1 Adds banarnarbread (#15984) 
* Adds banarnarbread

Adds banarnarbread

* Fixes nutriment between loaf and slice
 2021-06-17 10:36:46 +01:00
hal9000PR
85be09d7ce Refactors and tweaks reactive armours (#16086) 
* changes things

* Review

* better way of doing this.
 2021-06-17 10:33:39 +01:00
Qwertytoforty
9e28cc0afe Enforces nukies to wait at least 10 minutes after war before heading to station (#16115) 2021-06-17 10:32:59 +01:00
Farie82
e64d8d9de2 Optimizes customizable foods slightly + makes stacking beyond the limit of 41 impossible to avoid the server from dying (#16108) 
* Optimizes customizable snacks + fixes exploit
Makes adding ingredients to customizable snacks less performance heavy.
Makes it impossible to add customizable snacks together if that would make it go over the ingredient limit

* Fixes the auto doc syntax used

* QOL put in active hand + bug fix
 2021-06-17 10:31:50 +01:00
S34N
00de6dc6c1 Adds pref to remove internals pressure from status tab, adds it to inspect text (#16110) 
* yeets the internals from status panel

* adds pressure reading to the tank inspect text

* Adds a pref toggle

* numbers are hard

* catchup with master

* Revert "catchup with master"

This reverts commit bb972cb110.
 2021-06-17 10:30:30 +01:00
SabreML
75375efce9 Why is this a thing, really (#16169) 2021-06-17 10:23:14 +01:00
SabreML
5de0ebddaf plamsa (#16178) 2021-06-17 10:18:17 +01:00
hal9000PR
b7d9fcf87a fix (#16191) 2021-06-16 13:23:34 +01:00
Qwertytoforty
4d26621d0b Fixes being unable to pickup the armblade nullrod on mining (#16189) 2021-06-16 10:02:58 +01:00
SteelSlayer
01c0c86d01 robobrain runechat fix (#16176) 2021-06-14 11:35:54 +01:00
S34N
18f47d2ef3 Fixes broken shuttle and escape pod rotation (#16154) 
* Fixes shuttle rotation

* Apply AA suggestions

* 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>
 2021-06-13 18:08:15 +01:00
dearmochi
70447e7a4b Fix forum link runtime (#16166) 2021-06-12 18:23:38 +01:00
Farie82
7f6a28f16d Respawning using anomalous crystal exploit fixes (#16165) 
* Ahud anomalous crystal fix
Makes it so that you can't get around ahud enabling using the anomalous helper crystal

* Merge conflict fix thing
 2021-06-12 18:13:42 +01:00
S34N
ddacfbb009 fixes exploit (#16164) 2021-06-12 16:22:35 +01:00
dearmochi
0a6a441aa5 Fix nullspaced GPS causing runtime on display (#16146) 2021-06-09 18:47:25 +01:00
Dragonkiller93
d4402f2ebb Cleaner no longer resets Light Tiles. (#16070) 
* Cleaner no longer resets Light Tiles.

* Update code/modules/reagents/chemistry/reagents/water.dm

Spacing

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

* Creates a Clean proc, overrides it for light tile

* Forgot to fix this when copy pasting.

* Update code/game/turfs/turf.dm

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

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

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

* Update code/game/turfs/turf.dm

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

* Updates other files to match proc name

* Calls parent function instead of duplicating code.

* Update code/modules/reagents/chemistry/reagents/water.dm

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

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2021-06-08 15:04:28 +01:00
dearmochi
3650a943a4 AIs can no longer be pushed in disposal chutes (#16136) 2021-06-07 20:16:23 +01:00
Qwertytoforty
5896bd2c8e Fixes some exploits (#16134) 2021-06-07 18:46:16 +01:00
Dragonkiller93
6191c84860 Poly can no longer grab inside disposals. (#16068) 
* Poly can no longer grab inside disposals.

* Update code/modules/mob/living/simple_animal/parrot.dm

Spacing from SabreML

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

Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
 2021-06-06 12:45:49 +01:00
SabreML
9d10cf4260 Fixes soulstones ignoring DNR or AntagHUD settings (#16117) 
* DNR/AntagHUD soulstoning

* Update code/game/gamemodes/wizard/soulstone.dm

Co-authored-by: dearmochi <shenesis@gmail.com>

* Revive rune

Co-authored-by: dearmochi <shenesis@gmail.com>
 2021-06-06 12:43:28 +01:00