cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-08 00:21:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,598 Commits 26 Branches 2 Tags
ba8052af3fb4e973a036a14c19d040db78209f6a
Commit Graph

19560 Commits

Author SHA1 Message Date
warior4356
15b32b7283 Merge branch 'master' into holy-chapel 2021-07-05 18:12:02 -07: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
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
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
AffectedArc07
516cd5d557 Improves new player GCR 2021-06-29 20:23:49 +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
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
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
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
82b29ba837 I hate soulstones (#16227) 2021-06-22 10:41:19 +01:00
Akira Akashi
f1ad48c450 remove \the from loom.dm (#16222) 2021-06-21 10:42:20 +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
e4d71a172a Tweaks 2021-06-20 12:07:41 +01:00
hal9000PR
fc3185dcb6 fix (#16209) 2021-06-19 23:07:50 +01:00
AffectedArc07
066c61dccd Better atom rotation 2021-06-19 18:14:37 +01:00
Qwertytoforty
e852dd90fe Makes directional ranged attacks respect armor direction (#16206) 
* Makes directional ranged attacks respect armor direction

* src need not apply
 2021-06-19 14:11:48 +01:00
SabreML
dd02435095 Fixes secborg batons (#16196) 
* Cell linking

* V2
 2021-06-19 14:10:01 +01:00
hal9000PR
45449da433 table climbing fix (#16203) 
* table climbing fix

* TRUE/FALSE
 2021-06-18 21:00:27 +01:00
Aziz Chynaliev
acfcce6728 Do not run hack in /obj/structure/closet if not mapload (#13) (#16201) 
Co-authored-by: Simon Ogorodnik <simon.ogorodnik@gmail.com>
 2021-06-18 16:41:05 +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
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
RadiantFlash7
c55acec92b Makes E-Bolas as they should be. Noncyborg variants. (#16168) 
* The E-bola is not a cyborg variant.

Returns E-bola break out time to 60, instead of 20.
Security bolas are limited supply and should be better then makeshift ones.

* whoops

Adjusts the breakout time to not to default to beartraps and use the 6 seconds listed in the Ebola item.

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

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

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2021-06-17 10:25:24 +01:00
SabreML
75375efce9 Why is this a thing, really (#16169) 2021-06-17 10:23:14 +01:00
Qwertytoforty
4d26621d0b Fixes being unable to pickup the armblade nullrod on mining (#16189) 2021-06-16 10:02:58 +01:00
hal9000PR
455836c189 fi (#16184) 2021-06-15 12:55:56 +01:00