cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-20 18:47:20 +01:00
Code Issues Packages Projects Releases Wiki Activity
63,724 Commits 17 Branches 2 Tags
dependabot/github_actions/actions/setup-python-7.0.0
Commit Graph
5527 Commits
Author SHA1 Message Date
variableundefinedandGitHub 82b34ad8ed Merge pull request #15783 from E-MonaRhg/just-defibrillator-things 
More compact defibs: Electric boogaloo
 2021-09-06 21:56:46 -05:00
variableundefinedandGitHub 5c2834edd8 Merge pull request #16612 from AffectedArc07/cult-balance 
Cults now require a sacrifice before they can make mirror shields
 2021-09-06 21:41:50 -05:00
variableundefinedandGitHub cf5544846b Merge pull request #16613 from Qwertytoforty/transforming-views 
Removes transformation sting
 2021-09-06 21:40:06 -05:00
E-MonaRhg 23e9083d07 Merge remote-tracking branch 'upstream/master' into just-defibrillator-things 2021-09-06 19:47:03 +02:00
Qwertytoforty e9761d0e18 Draw 2 circles 2021-09-03 17:34:43 -04:00
SabreML c122e67693 Merge remote-tracking branch 'upstream/master' into fix-bundle-4 2021-09-02 17:48:42 +01:00
AffectedArc07 70fd70f2eb Merge remote-tracking branch 'ParadiseSS13/master' into client-data-loading 2021-09-02 14:01:27 +01:00
variableundefinedandGitHub 188496c678 Merge pull request #16595 from SabreML/clothing-migration 
[IDB IGNORE] Clothing .dmi file organisation
 2021-09-01 19:44:59 -05:00
sldominoandGitHub f26eb0824d changes clings tentacle icon path (#16617) 
tentacle icon was in items.dmi instead
 2021-08-30 21:16:54 +01:00
AffectedArc07andGitHub 4062bc6b1a Merge branch 'master' into client-data-loading 2021-08-29 20:56:41 +01:00
variableundefinedandGitHub e4355d7d63 Merge pull request #16529 from chafla/foam-fixes 
Ensure only pistol-type weapons can be holstered
 2021-08-29 14:47:09 -05:00
Qwertytoforty e633d9f6ce removes a little prick 2021-08-29 15:42:10 -04:00
AffectedArc07 4059c32f21 pain 2021-08-29 20:41:00 +01:00
QwertytofortyGitHubFarie82dearmochiSabreML
 		f628ec3333 Allows nuke core containers to be broken open (#16570) 
* Allows nuke core containers to be broken open

* Apply suggestions from code review

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

* Improves unload, removes duplicate, better logging, changes name on cracking open

* Update code/game/objects/items/theft_items.dm

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

* Some of sabres stuff

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

* Fixes engineers / atmos techs getting objective, boldnotice

* Testing to figure out why this is conflicted

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com>
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
 2021-08-25 15:50:24 +01:00
S34NandGitHub 7188e92123 wall jaunting begone (#16591) 2021-08-25 15:37:30 +01:00
SabreML 6648d3131f Clothing Organisation V1 2021-08-24 18:37:48 +01:00
S34NandGitHub 9f9be3a2b8 world.name begone (#16584) 2021-08-21 20:46:58 +01:00
SabreMLandGitHub 899acc3344 Quick rune fix (#16578) 2021-08-21 15:46:44 +01:00
Mieszko JędrzejczakGitHubSabreML
 		00dedfe6a9 Swiftly sanction Sabre's systematic suggestions 
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
 2021-08-21 12:57:24 +02:00
Mieszko Jedrzejczak 559fa37756 add defines for damage flags 2021-08-20 21:09:21 +02:00
Fox McCloudandGitHub 5af76d92cc Merge pull request #16498 from shmabuu/Fake-Blindfold 
Adds Fake Blindfold
 2021-08-18 16:02:42 -04:00
S34NandGitHub 8b6f00bd45 generals are more logical (#16550) 2021-08-15 16:05:50 +01:00
E-MonaRhg 101551865f Merge remote-tracking branch 'upstream/master' into just-defibrillator-things 2021-08-14 17:42:06 +02:00
chafla 0f0a18c6c7 Set holster default to false 2021-08-12 14:42:36 -07:00
QwertytofortyGitHubSteelSlayer
 		0aeb2d97bd Update code/game/gamemodes/steal_items.dm 
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2021-08-12 13:20:22 -04:00
QwertytofortyGitHubAffectedArc07
 		8f169f787e oops 
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2021-08-12 12:28:44 -04:00
Qwertytoforty 02ec9714fb Fixes grammer / bugs with supermater sliver and nuke core objectives 2021-08-12 10:52:34 -04:00
AffectedArc07 1fa6186946 Merge remote-tracking branch 'ParadiseSS13/master' into client-data-loading 2021-08-12 13:24:13 +01:00
variableundefinedandGitHub 480677e8e7 Merge pull request #16523 from hal9000PR/emp-fix 
Fixes a cult EMP exploit
 2021-08-11 16:15:20 -04:00
variableundefinedandGitHub 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
hal9000PR 5d5e837f51 exploit fix 2021-08-11 20:06:35 +01:00
SabreML 4c04ecd5fb Epinephrine Overdose blindless 2021-08-11 15:52:22 +01:00
shmabuu 0749f51a82 update vampire_powers.dm and glasses.dm 2021-08-07 20:38:32 -07: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
SabreMLGitHubSteelSlayer
 		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
S34NandGitHub 606bd484ac Merge branch 'master' into AI_announcer_new 2021-08-05 09:53:03 +01:00
AffectedArc07 f73af8b3cf Refactors client data loading 2021-07-29 12:52:45 +01: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
S34NGitHubSabreML
 		d48906e131 Apply suggestions from code review 
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
 2021-07-28 17:21:48 +01:00
variableundefinedandGitHub 72dff99c99 Convert wizard contract to TGUI (#15083) 
* Convert Wizard Apprentice contract to TGUI

* Addresses concerns

* Formatting fix and redundant comment removal

* Update code and remove unused variable

* Rebuild TGUI
 2021-07-27 20:36:24 +01:00
E-MonaRhg 4ee75ce29d Merge remote-tracking branch 'upstream/master' into just-defibrillator-things 2021-07-27 16:37:58 +02:00
variableundefinedandGitHub 5661f74e34 Merge pull request #16433 from AffectedArc07/sql-schema-update 
Removes table prefixes
 2021-07-27 08:33:56 -04: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
AffectedArc07 bede78aeff Removes table prefixes 2021-07-26 17:21:24 +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 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
hal9000PRandGitHub 48ad06e033 ughhh (#16419) 2021-07-24 23:39:31 +01:00
Qwertytoforty eeb8f7054c Order tweaks, removal of duplicate 2021-07-23 14:36:18 -04:00
QwertytofortyGitHubSabreML
 		5326447264 Apply final suggestions 
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
 2021-07-23 13:54:24 -04:00