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

37646 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
LordShekelstein
3efc77a9e8 fixes spelling error. (#16308) 2021-07-05 18:27:53 +01:00
SabreML
f9ef6a6d38 Observation Console Fix (#16296) 2021-07-04 12:01:47 +01:00
LordShekelstein
f4e07cd148 Fixes a glaring grammatical error in the matter bin's description. (#16299) 
* How did this get past S34N?

* Round 2, cleanup
 2021-07-04 11:42:54 +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
hal9000PR
7e16877a2e Adds radial menus to blood rites (#16118) 
* radial menu

* new sprite
 2021-07-02 20:46:32 +01:00
Qwertytoforty
15b7a76c91 Fixes syndicate teleporter saving throw bug (#16287) 2021-07-02 19:39:58 +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
Qwertytoforty
7413256cb8 Prevents ghosts from setting off mousetraps (#16274) 
* Prevents ghosts from setting off mousetraps

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

Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com>

* Note to self: Do not be tired when commiting suggestions

Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com>

Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com>
 2021-07-02 16:20:12 +01:00
Mitchs98
1af34decd7 Fixes some typos in the spellbook. (#16281) 
* spellcheck

* Fixes my own typo
 2021-07-02 10:55:46 +01:00
LordShekelstein
66cc94be42 fixes the grammar error (#16280) 2021-07-02 10:55:23 +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
hal9000PR
dd9278ae98 bomb (#16273) 2021-06-30 22:47:01 +01:00
AffectedArc07
516cd5d557 Improves new player GCR 2021-06-29 20:23:49 +01:00
Qwertytoforty
ec967cbaa7 Prevents TK moving objects with people in or buckled to it (#16160) 
* Prevents TK moving objects with people in or buckled to it

* Better proc for mob checking

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

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2021-06-29 12:23:33 +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
hal9000PR
27fe4da2df Hand tele portals malfunctions teleport to random Z levels (#16126) 
* thinking about portals

* affected's suggestion

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

* teleporter machine change

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2021-06-29 11:46:13 +01:00
S34N
c1d19836e1 Adds warning to gluttony morph about not being an antag (#16148) 
* chat message about not being an antag

* melts the snowflake

* forgot to do this

* Update code/datums/diseases/transformation.dm
 2021-06-29 11:45:35 +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
S34N
e08220e76c Makes CC cryogenic freezers silent (#16223) 
* Makes CC cryopods silent

* tweak
 2021-06-29 11:42:31 +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
Qwertytoforty
e99a5952ae Prevents AIS from gibbing when being carded from a mech (#16271) 2021-06-28 15:45:24 +01:00
S34N
1ace0bd912 Fixes bot pathing (#16270) 2021-06-28 15:16:41 +01:00
hal9000PR
2b147b29c2 Fixes upgraded teleporters UI (#16198) 
* fix

* I did an oopsy
 2021-06-28 11:00:27 +01: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
S34N
6080189ea3 Fixes powersink not giving you a beacon on purchase. (#16255) 
* powersink gives you a beacon, as described

* no longer a bomb subtype

* Update code/game/objects/items/devices/radio/beacon.dm

Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com>

* Update code/game/objects/items/devices/radio/beacon.dm

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

Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2021-06-26 21:34:08 +01:00
Qwertytoforty
d6f15657fe Fixes contractors removing ipc power cord (#16262) 2021-06-26 21:33:40 +01:00
S34N
4a30b87a26 thralls no longer waste your blood (#16257) 2021-06-26 14:39:37 +01:00
S34N
672f900b40 fixes RPD eating TEG circulators (#16258) 2021-06-26 14:36:40 +01:00
meow20
8e383c6fc5 Stops swarmers from eating tiny fans and holo fans. (#16253) 
* Update swarmer.dm

* Update swarmer.dm

Co-authored-by: meow20 <meow20@onet.pl>
 2021-06-25 18:49:06 +01:00
SteelSlayer
eb5fa5080c Update robot_upgrades.dm (#16248) 2021-06-25 18:48:04 +01:00
hal9000PR
e4d1788088 Fixes singulo hammer sucking in ghosts (#16247) 
* fix

* review
 2021-06-24 20:02:32 +01:00
AffectedArc07
9b86a42a3d Casing 2021-06-24 17:29:18 +01:00
AffectedArc07
956daa36ec Farie tweaks 2021-06-24 12:32:53 +01:00
Qwertytoforty
cfddae4a32 Prevents cult pylons from converting indestructible walls (#16244) 2021-06-24 12:11:26 +01:00
Akira Akashi
93a0b15834 capitalise the no-prints and x-ray deactivation messages (#16225) 
* capitalise the no-prints deactivation message

* capatalise x-ray deactivation
 2021-06-22 21:06:48 +01:00
dearmochi
b1fe555a79 Fix shower mist not going away on deconstruction (#16233) 
Co-authored-by: dearmochi <>
 2021-06-22 21:05:14 +01:00
SabreML
483f31e038 This was a lot simpler than I expected (#16230) 2021-06-22 10:42:48 +01:00
SabreML
82b29ba837 I hate soulstones (#16227) 2021-06-22 10:41:19 +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
Akira Akashi
f1ad48c450 remove \the from loom.dm (#16222) 2021-06-21 10:42:20 +01:00