cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-24 01:02:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
58,079 Commits 26 Branches 2 Tags
82b863cefdabb64cb15e03dd7978006390c0f3be
Commit Graph

1522 Commits

Author SHA1 Message Date
Exavere
332c17155c More mistake fixing, yay 2021-09-21 15:06:21 -05:00
Exavere
c01f71a9f6 agony 2021-09-21 14:59:55 -05:00
Exavere
6c0b93091a Hopefully my smoothbrain gets this right. 2021-09-21 14:57:11 -05:00
Exavere
8ab7b6a306 Fixes #16757 2021-09-21 13:18:00 -05:00
variableundefined
fa3fa1dc6a Merge pull request #16579 from FlattestGuitar/armor-defines 
Adds defines for damage flags
 2021-09-17 22:10:20 -05:00
variableundefined
81688b2de7 Merge pull request #16643 from LightFire53/Console-Fixes 
Console Minor Fixes
 2021-09-08 08:36:15 -05: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
82b34ad8ed Merge pull request #15783 from E-MonaRhg/just-defibrillator-things 
More compact defibs: Electric boogaloo
 2021-09-06 21:56:46 -05:00
variableundefined
2354619f17 Merge pull request #16525 from S34NW/glass_floors_2 
Glass floors attempt 2
 2021-09-06 19:10:44 -05:00
LightFire53
2531a8ce89 Black magicks 
Told by S34N that this will fix an issue with solar control consoles being bugged visually
 2021-09-06 16:46:07 -07:00
E-MonaRhg
23e9083d07 Merge remote-tracking branch 'upstream/master' into just-defibrillator-things 2021-09-06 19:47:03 +02:00
variableundefined
dd17035c1f Merge pull request #16567 from SabreML/fluorescent-lights 
Adds a short warm-up time when turning on a light
 2021-09-05 16:05:21 -05:00
Mieszko Jedrzejczak
559fa37756 add defines for damage flags 2021-08-20 21:09:21 +02:00
S34N
df51d7370d they now work as intended (#16575) 2021-08-20 14:30:52 +01:00
SabreML
3d114d0e4e Privatisation 
Still possible to call this improperly, but a lot harder.
 2021-08-19 14:14:42 +01:00
SabreML
1c14cf733b Light delay V1 2021-08-19 01:19:24 +01:00
E-MonaRhg
101551865f Merge remote-tracking branch 'upstream/master' into just-defibrillator-things 2021-08-14 17:42:06 +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
S34NW
ea87e351a2 Merge branch 'master' into tgglassfloors 2021-08-05 15:17: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
variableundefined
fba7585b4e Revert "Increases most radiation dose amounts" (#16445) 2021-07-28 10:11:27 +01:00
E-MonaRhg
6da7633122 Re-adds what was removed 2021-07-27 19:17:47 +02:00
E-MonaRhg
4ee75ce29d Merge remote-tracking branch 'upstream/master' into just-defibrillator-things 2021-07-27 16:37:58 +02:00
Fox McCloud
7b5db2d085 Merge pull request #16123 from Arvenius169/Replaces-between()-With-Native-clamp() 
Replaces between() With Native clamp()
 2021-07-26 15:36:20 -04: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
variableundefined
09a5988ce2 Merge pull request #16147 from S34NW/rad_damage_normalise 
Increases most radiation dose amounts
 2021-07-25 09:15:40 -04:00
variableundefined
7526d01c67 Merge pull request #15760 from hal9000PR/FUSION-FRENZY 
Adds an interaction between two SMs when they collide.
 2021-07-25 09:01:00 -04:00
Qwertytoforty
eeb8f7054c Order tweaks, removal of duplicate 2021-07-23 14:36:18 -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
S34NW
85b9adc5a8 Merge remote-tracking branch 'upstream/master' into tgglassfloors 2021-07-18 19:57:12 +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
Fox McCloud
dad52950ff Merge pull request #16156 from ppi13/singularity-radiation-fix 
Fixes singularity radiation not reaching rad collectors
 2021-07-08 20:13:38 -04:00
E-MonaRhg
c303a2b3f2 Merge remote-tracking branch 'upstream/master' into just-defibrillator-things 2021-07-09 00:03:38 +02:00
Qwertytoforty
f8bc686abb Adds the B.S.G (#15798) 
* Adds the 100% original and serious BSG

* Adds sprites

* prevents divide by zero

* Adds to protolathe, shield from projectiles, prevents hitting through walls

* adds sprites for inhands, pain, and suffering

* Finished the gun sprites.

* Adds admin version, sound effect, visual

* moves chain to base projectile, adds shitty sprite for bsg explosion

* Fixes it, maybe.

* I hate merge conflicts, gun sprites are back

* I need this, it seems.

* re-adds sprites back

* Prevents turrets from working with BSG, adds a variable for it, heavily nerfs the BSG stun to be more of a trip

* Apply grammer and spaceing suggestions from code review

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

* Makes the code clearer, use update icon, fix shaded charge

* Better inhands, tweaked base sprite

* Better explosion effect, mochi suggestion, PR ready

* Accidently removed this

* I did not intend to put this in, I discarded this change

* Update settings.json

* Spelling and return removal

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

* Removes spawn, makes it a callback

* Lowercase states

Co-authored-by: dearmochi <shenesis@gmail.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2021-07-08 22:48:54 +01:00
hal9000PR
3f6eac48d1 Fixes getting TK abilities when you shouldn't (#16300) 
* fix

* oops

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

* review

* oops

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2021-07-07 19:22:49 +01:00
S34NW
2414afc550 stare at the supermatter in this brand new update! 2021-07-05 22:53:55 +01:00
Fox McCloud
d9d09deb00 Merge pull request #16212 from AffectedArc07/atom-rotation 
Better atom rotation
 2021-07-01 22:15:58 -04: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
Qwertytoforty
e4461eac09 Please don't break 2021-06-28 19:12:39 -04:00
AffectedArc07
ed11899f11 Merge branch 'master' into toml-config 2021-06-23 08:44:32 +00:00
S34N
04628f7df4 Merge branch 'master' into tgglassfloors 2021-06-20 16:32:22 +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
066c61dccd Better atom rotation 2021-06-19 18:14:37 +01:00
ppi13
79fe4f7dd2 Fixes singularity radiation not reaching rad collectors 2021-06-11 18:23:06 +02:00
S34NW
616e641d71 RAD_DOSAGE_MULTIPLIER is a better name 2021-06-10 09:58:18 +01:00
S34NW
396309095d further tweak the properties 2021-06-09 18:12:02 +01:00