cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-17 10:03:50 +01:00
Code Issues Packages Projects Releases Wiki Activity
60,117 Commits 16 Branches 2 Tags
dev-docs-readme
Commit Graph

7135 Commits

Author SHA1 Message Date
SabreML 6648d3131f Clothing Organisation V1 2021-08-24 18:37:48 +01:00
S34NW 14004ce2f2 fax machines, chairs, pews, corpo sofa 2021-08-22 16:34:55 +01:00
Mieszko Jedrzejczak 559fa37756 add defines for damage flags 2021-08-20 21:09:21 +02:00
S34NW e7e4e6beb6 new lights, dupe sprite removal, APC cell clarity 2021-08-20 12:52:39 +01:00
SabreML 1c14cf733b Light delay V1 2021-08-19 01:19:24 +01:00
Fox McCloud 5af76d92cc Merge pull request #16498 from shmabuu/Fake-Blindfold 
Adds Fake Blindfold
 2021-08-18 16:02:42 -04:00
E-MonaRhg 6e9cd90cfc Merge remote-tracking branch 'upstream/master' into departmental-clothing-vendors 2021-08-17 17:45:57 +02:00
E-MonaRhg 97996dd4de Just a singular letter letter addition (#16556) 2021-08-16 22:39:45 +01:00
E-MonaRhg 101551865f Merge remote-tracking branch 'upstream/master' into just-defibrillator-things 2021-08-14 17:42:06 +02:00
E-MonaRhg c895e47ccb Merge remote-tracking branch 'upstream/master' into departmental-clothing-vendors 2021-08-13 19:26:44 +02:00
S34NW 6234346ff0 Revert "Revert "Adds glass floors" (#16524)" 
This reverts commit 517f5e8304.
 2021-08-11 21:29:00 +01:00
variableundefined 517f5e8304 Revert "Adds glass floors" (#16524) 2021-08-11 21:18:49 +01:00
variableundefined d8bfbe307a Merge pull request #15929 from S34NW/tgglassfloors 
Adds glass floors
 2021-08-11 16:08:09 -04:00
variableundefined 99e8487bfd Merge pull request #15656 from Qwertytoforty/I-guess-I-port-stuff-now-huh 
Adds supermatter sliver steal and plutonium core steal objective from TG
 2021-08-11 16:05:24 -04:00
SabreML c161e34a4d Possessed Blade poll 2021-08-11 16:20:59 +01:00
Cocacolagua fa1554a21f no more helmet protection 2021-08-10 10:58:12 -03:00
shmabuu 61330ef44a i do be seeing part 2 2021-08-07 01:36:50 -07:00
S34NW fa88d21ae4 Merge branch 'master' into solgov_ERT 2021-08-06 15:47:40 +01:00
E-MonaRhg ecd50aaf71 Suggested stuff + security bomber jacket and renamed hard hats 2021-08-06 14:50:11 +02:00
E-MonaRhg c652bbfa10 Initial departmental clothing vendors commit 2021-08-05 22:01:05 +02:00
S34NW ea87e351a2 Merge branch 'master' into tgglassfloors 2021-08-05 15:17:09 +01:00
hal9000PR b2d46ba7bc fix (#16485) 2021-08-05 14:42:33 +01:00
SabreML 02fe0876f5 Fix bundle #3 (#16411) 
* Explosive implant

* Package wrapper

* Venus human trap sprites

* Vine damage

* Wisp vision

* Display case

* Storage viewing

* Ghost poll nullspacing

* Inflatable barrier piercing

* Pneumatic cannon

* Cow grammar

* Centcom jaunting

* Consistency

Not actually a lazy list, as far as I can tell

* Review 1

Co-Authored-By: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Review 2

Co-Authored-By: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* length()

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2021-08-05 11:04:27 +01:00
S34N e75d8357eb i touched the intercoms (#16483) 2021-08-05 10:55:17 +01:00
E-MonaRhg 4814d4b29a Fixes the floor painter icon state (#16473) 2021-08-03 00:25:08 +01:00
Farie82 398ac7b286 Can't have infinite EMP implant charges anymore (#16469) 
* Can't have infinite EMP implant charges anymore
 + Makes the EMP implant call empulse async

* pulse pulse
 2021-08-02 13:47:24 +01:00
warior4356 72559ddf70 Fixes telekinesis crafting appearing at mob's feet (#16337) 
* Fixes TK building in strange places.

* Minor formatting tweaks

* replaces usr.loc
 2021-07-30 11:58:09 +01:00
Qwertytoforty c45a359769 Grammer and style 
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
 2021-07-28 18:21:58 -04:00
AffectedArc07 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
variableundefined e788278f57 Merge pull request #16397 from Sirryan2002/ERTFix 
Jani ERT Equipment Tweak
 2021-07-26 20:37:03 -04:00
variableundefined ec7206e612 Merge pull request #15599 from SabreML/flyswatter-fix 
Fixes the flyswatter not swatting flies
 2021-07-26 13:36:54 -04:00
LordShekelstein 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
SabreML 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
hal9000PR 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
datlo 01dfe5c7b7 Remove freeform core quotes (#16423) 2021-07-25 15:50:40 +01:00
variableundefined b9aa1facce Merge pull request #15757 from warior4356/holy-chapel 
Makes the chapel holy once more.
 2021-07-25 08:37:18 -04:00
variableundefined ea316e7fca Merge pull request #15902 from AffectedArc07/tg-ids 
"New" ID card sprites
 2021-07-25 08:27:28 -04:00
variableundefined 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
datlo 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
Qwertytoforty 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
Qwertytoforty 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
dearmochi 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
SabreML 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