cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-03 06:01:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,504 Commits 26 Branches 2 Tags
2c4cf6db3dde554e8bdc8fcd2aa9229e64647ba2
Commit Graph

3848 Commits

Author SHA1 Message Date
AffectedArc07
b0e9db64bd Revert "Merge pull request #16520 from SabreML/fix-bundle-4" 
This reverts commit 9a62622fbc, reversing
changes made to 841ad0f1fd.
 2021-09-07 16:16:40 +01:00
variableundefined
c2664eec0d Merge pull request #16311 from S34NW/does-anyone-else-hate-genetics 
Replaces genetics xray vision with other vision genes
 2021-09-06 23:16:04 -05:00
variableundefined
9a62622fbc Merge pull request #16520 from SabreML/fix-bundle-4 
Fix bundle #4
 2021-09-06 22:29:10 -05:00
E-MonaRhg
23e9083d07 Merge remote-tracking branch 'upstream/master' into just-defibrillator-things 2021-09-06 19:47:03 +02:00
SabreML
c122e67693 Merge remote-tracking branch 'upstream/master' into fix-bundle-4 2021-09-02 17:48:42 +01:00
variableundefined
188496c678 Merge pull request #16595 from SabreML/clothing-migration 
[IDB IGNORE] Clothing .dmi file organisation
 2021-09-01 19:44:59 -05:00
variableundefined
d1ee992ba1 Merge pull request #16519 from Cocacolagua/head-bonk 
Helmets no longer protect you from bible brain damage
 2021-08-29 14:47:30 -05:00
SabreML
6648d3131f Clothing Organisation V1 2021-08-24 18:37:48 +01:00
S34NW
e7e4e6beb6 new lights, dupe sprite removal, APC cell clarity 2021-08-20 12:52:39 +01: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
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
S34NW
fa88d21ae4 Merge branch 'master' into solgov_ERT 2021-08-06 15:47:40 +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
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
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
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
6f6d04f8f7 Merge remote-tracking branch 'upstream/master' into I-guess-I-port-stuff-now-huh 2021-07-23 10:35:54 -04:00
Sirryan2002
6b6b9a68da Jani ERT Equipment Tweak 2021-07-19 16:28:31 -04:00
Farie82
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
SabreML
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
E-MonaRhg
c303a2b3f2 Merge remote-tracking branch 'upstream/master' into just-defibrillator-things 2021-07-09 00:03:38 +02:00
Qwertytoforty
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
SabreML
04c689817e Fire + Cloth = Bad things (#15635) 2021-07-08 22:57:08 +01:00
hal9000PR
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
warior4356
b949b1adc2 Adds sec hailers and space pod keys to sec belt (#15977) 2021-07-08 22:31:06 +01:00
E-MonaRhg
8719801295 Bandolier stacks (#16106) 2021-07-08 22:22:59 +01:00
Qwertytoforty
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
S34NW
705a013445 i do 2021-07-05 22:44:30 +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
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
Qwertytoforty
e4461eac09 Please don't break 2021-06-28 19:12:39 -04:00