cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-26 21:48:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
63,849 Commits 14 Branches 2 Tags
master
Commit Graph
7758 Commits
Author SHA1 Message Date
QwertytofortyGitHubSabreML
 		c45a359769 Grammer and style 
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
 2021-07-28 18:21:58 -04:00
AffectedArc07andGitHub e46f67810a Cleans up the TODOs I left all over the codebase (#16443) 
* Removes command_name() proc

* Removes GLOB.teleportlocs + GLOB.ghostteleportlocs

* Clean up IPIntel

* Tweaks karma logging

* Tweaks time
 2021-07-28 13:45:18 -04:00
E-MonaRhg ee47ea90cb Makes the advanced defib give heart attacks as intended 2021-07-27 19:02:29 +02:00
E-MonaRhg 51a36cfb9f Makes the advanced defib emaggable + sprite tweaks 2021-07-27 18:11:12 +02:00
E-MonaRhg 4ee75ce29d Merge remote-tracking branch 'upstream/master' into just-defibrillator-things 2021-07-27 16:37:58 +02:00
variableundefinedandGitHub e788278f57 Merge pull request #16397 from Sirryan2002/ERTFix 
Jani ERT Equipment Tweak
 2021-07-26 20:37:03 -04:00
variableundefinedandGitHub ec7206e612 Merge pull request #15599 from SabreML/flyswatter-fix 
Fixes the flyswatter not swatting flies
 2021-07-26 13:36:54 -04:00
LordShekelsteinandGitHub ab0fac5d04 Gives the Singularity Hammer a much needed buff. (#16276) 
* buffs the singularityhammer

* Sets the force back to 5... why did I put a 1 there?
 2021-07-26 18:13:01 +01:00
SabreMLandGitHub 2c0ae9c500 Refactors the 'Examine' status tab (#16330) 
* Removes the 'Examine' tab

* Revert "Removes the 'Examine' tab"

This reverts commit 0dd01722c9.

* Initial system and misc items

* Atmospherics

* Engineering

* Medical

* Mobs

* Stacks

* Structures

* Turfs & Weapons

* Final stuff and bad documentation

* Sheer laziness
 2021-07-26 18:11:57 +01:00
hal9000PRGitHubSabreML
 		7906e66871 Adds feedback for defibbing and scanning husked people (#16357) 
* husk

* extra space

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

Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
 2021-07-26 18:08:37 +01:00
datloandGitHub 01dfe5c7b7 Remove freeform core quotes (#16423) 2021-07-25 15:50:40 +01:00
variableundefinedandGitHub b9aa1facce Merge pull request #15757 from warior4356/holy-chapel 
Makes the chapel holy once more.
 2021-07-25 08:37:18 -04:00
variableundefinedandGitHub ea316e7fca Merge pull request #15902 from AffectedArc07/tg-ids 
"New" ID card sprites
 2021-07-25 08:27:28 -04:00
variableundefinedandGitHub d91c8ba479 Merge pull request #15980 from AffectedArc07/toml-config 
[READY] Converts configs to use TOML + Configuration refactor
 2021-07-25 08:26:29 -04:00
datloGitHubSean WilliamsdearmochiAffectedArc07
 		daf2453d15 Add new lawsets and reorganise AI upload, the Third (#15743) 
* lawsets update

* Revert "lawsets update"

This reverts commit a68ddcb9ee.

* Lawsets update

* Remove quotes on ai module names

* fix map file

* Fix coding style

* Update hippocratic per review

Co-authored-by: Sean Williams <06sean@gmail.com>

* Update hippocratic per review

Co-authored-by: Sean Williams <06sean@gmail.com>

* Update hippocratic per review

Co-authored-by: Sean Williams <06sean@gmail.com>

* Fix merge conflict

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

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

* Add a pilot seat to the ERT shuttle

* Revert "Add a pilot seat to the ERT shuttle"

This reverts commit 676bfa7d03.

* Update MetaStation.dmm

* deconflict

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

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

Co-authored-by: Sean Williams <06sean@gmail.com>
Co-authored-by: dearmochi <shenesis@gmail.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2021-07-25 10:19:58 +01:00
Qwertytoforty eeb8f7054c Order tweaks, removal of duplicate 2021-07-23 14:36:18 -04:00
QwertytofortyGitHubSabreML
 		18f3e19051 Apply more suggestions without doing multiline 
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
 2021-07-23 13:52:43 -04:00
QwertytofortyGitHubSabreML
 		76d64ecc4b Apply the second third of suggestions 
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
 2021-07-23 13:50:23 -04:00
Qwertytoforty 6f6d04f8f7 Merge remote-tracking branch 'upstream/master' into I-guess-I-port-stuff-now-huh 2021-07-23 10:35:54 -04:00
dearmochiandGitHub 3938f6d0ad Fix floor painters being able to paint non-floor (#16404) 2021-07-21 08:30:57 +00:00
S34NW 6d312f3a4b floor painter thingybob 2021-07-20 17:35:46 +01:00
SabreMLGitHubSteelSlayerSean Williams
 		150e7e3f60 Painter Item Refactor (#15828) 
* Modular Painter V1

* Improved Suicide

* Type & Text

Also `item_state` just goes from `icon_state` so it's not needed.

* Modular Painter V2

Big refactor of everything to use datums rather than separate objects.

* Steel airlock stuff

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

* Vile Heresy

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

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: Sean Williams <12197162+S34NW@users.noreply.github.com>
 2021-07-20 15:25:45 +01:00
Sirryan2002 6b6b9a68da Jani ERT Equipment Tweak 2021-07-19 16:28:31 -04:00
Farie82GitHubdearmochijoep van der velden
 		64930de41c Makes all toy figurines tiny and refactors the code behind it (#15368) 
* Makes toy figures tiny and refactors the code behind it

* Apply suggestions from code review

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

* atom_say and capitalize names

* Web edit baby

* Merge conflict fixes

* Init instead of New

* prize_ball instead of mechball

* prize_ball should not be a figure. Revert but keep the Init change

Co-authored-by: joep van der velden <15887760+farie82@users.noreply.github.com>
Co-authored-by: dearmochi <shenesis@gmail.com>
 2021-07-15 13:59:26 +01:00
AffectedArc07 035964ceb2 Merge remote-tracking branch 'ParadiseSS13/master' into toml-config 2021-07-13 14:25:12 +01:00
SabreMLandGitHub 3e8482cebb Makes machine frames show their circuit name (#15025) 
* Circuit Names Refactor

* Some review stuff

* now with less runtimes

* Machine Boards and Computer Boards

* Only a little late

* YouTool fix

* Resupply crate too

* Supplycomp board

I'll do the other stuff tomorrow

* Computer Frame Refactor

Plus also removing the HONKputer to avoid a conflict.

* Don't need this diff anymore
 2021-07-10 19:43:40 +01:00
S34NW 59938c00e5 Merge branch 'master' into solgov_ERT 2021-07-10 15:43:33 +01:00
E-MonaRhg f83b8ae14e Suggested stuff 2021-07-09 19:44:02 +02:00
AffectedArc07 9ddf4ceb97 Merge remote-tracking branch 'ParadiseSS13/master' into toml-config 2021-07-09 11:42:23 +01:00
SabreMLandGitHub 908c4f0dd1 Jobban adjustments (#16319) 
* Borer ban

* Terror Spider jobban category

* Defines
 2021-07-09 11:39:01 +01:00
KepplerxandGitHub 1d04a9ec74 AI Detector can now only detect AI, not Abductors, Xenobio consoles or Shuttles (#15535) 
* Update navigation_computer.dm

* V7

* Update navigation_computer.dm

* All instances

* Added explainers

Seems this is done some places, seems nice and easier to understand with em

* Updated name

* Change Variable name

Changed as per advise of Fox
 2021-07-08 23:18:15 +01:00
E-MonaRhg c303a2b3f2 Merge remote-tracking branch 'upstream/master' into just-defibrillator-things 2021-07-09 00:03:38 +02:00
QwertytofortyandGitHub 92bdb8f159 Makes gluon grenades use ice instead of permafrost (#15577) 
* Makes gluon grenades use ice instead of permafrost

* Makes it only select floor turfs
 2021-07-08 22:58:44 +01:00
SabreMLandGitHub 04c689817e Fire + Cloth = Bad things (#15635) 2021-07-08 22:57:08 +01:00
hal9000PRGitHubFarie82
 		d85f2261e5 Fixes firing flamethrowers when you cannot fire guns (#15935) 
* fixes

* code review

* code review

* Henk review 2

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

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2021-07-08 22:35:23 +01:00
Sirryan2002GitHubSean Williams
 		a598acf159 General Bugfixes + Closing Issues (#15936) 
* Prevents Species Action Icons from Duplicating

* Spelling Correction for Igniter

* Guardian Fixes

* Photocopier bugfix

* another spelling fix

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

* removes redundant item_state declaration

Co-authored-by: Sean Williams <12197162+S34NW@users.noreply.github.com>
 2021-07-08 22:33:59 +01:00
warior4356andGitHub b949b1adc2 Adds sec hailers and space pod keys to sec belt (#15977) 2021-07-08 22:31:06 +01:00
E-MonaRhgandGitHub 8719801295 Bandolier stacks (#16106) 2021-07-08 22:22:59 +01:00
QwertytofortyandGitHub 8dcb2c1a0f Prevents final summon rune by being cleaned by normal methods (#16224) 
* Prevents final summon rune by being cleaned by normal methods

* Makes it a proc

* Moves cleanable, makes it work with space cleaner
 2021-07-08 22:20:32 +01:00
AffectedArc07 c56c14fda8 Merge remote-tracking branch 'ParadiseSS13/master' into tg-ids 2021-07-07 15:00:35 +01:00
Fox McCloudandGitHub f5af21b794 Merge pull request #16213 from AffectedArc07/nukes-awful-code 
Removes some oldcode
 2021-07-07 09:57:16 -04:00
warior4356 15b32b7283 Merge branch 'master' into holy-chapel 2021-07-05 18:12:02 -07:00
S34NW 705a013445 i do 2021-07-05 22:44:30 +01:00
LordShekelsteinandGitHub 3efc77a9e8 fixes spelling error. (#16308) 2021-07-05 18:27:53 +01:00
LordShekelsteinandGitHub 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
QwertytofortyGitHubS34NdearmochiAffectedArc07
 		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
QwertytofortyandGitHub 15b7a76c91 Fixes syndicate teleporter saving throw bug (#16287) 2021-07-02 19:39:58 +01:00
QwertytofortyGitHubdearmochi
 		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
QwertytofortyGitHubAffectedArc07S34NSteelSlayer
 		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
warior4356 aec95fed48 Merge branch 'master' into holy-chapel 2021-06-28 20:31:34 -07:00