cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-04 22:52:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,092 Commits 26 Branches 2 Tags
4e40353cfa9375bcf2ebd1182e4591663d36fedc
Commit Graph

56 Commits

Author SHA1 Message Date
variableundefined
fa3fa1dc6a Merge pull request #16579 from FlattestGuitar/armor-defines 
Adds defines for damage flags
 2021-09-17 22:10:20 -05:00
Fox McCloud
a1da898f44 Merge pull request #16684 from S34NW/transparent_turf_sanity_check 
Fixes runtimes in null turfs
 2021-09-11 06:38:17 -04:00
S34NW
3048884b06 behone foul runtimes 2021-09-11 11:19:37 +01:00
variableundefined
dd3cff98ae Change "abiotic items" message to be more clear (#16545) 
* Change "abiotic items" message to be more clear

* Add missing period.
 2021-09-09 23:20:13 +01:00
variableundefined
2354619f17 Merge pull request #16525 from S34NW/glass_floors_2 
Glass floors attempt 2
 2021-09-06 19:10:44 -05:00
Mieszko Jedrzejczak
559fa37756 add defines for damage flags 2021-08-20 21:09:21 +02:00
S34NW
11b52496c3 fixes to sabre issues 2021-08-20 18:54:20 +01:00
joep van der velden
7ed779b2e4 Merge remote-tracking branch 'upstream/master' into fireflash-fixes 2021-08-15 10:14:43 +02:00
S34NW
1ee21dccb1 more fixes 2021-08-14 18:21:23 +01:00
S34N
073cbcf944 Apply suggestions from code review 
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
 2021-08-14 18:01:10 +01:00
variableundefined
5eb9a84d11 Merge pull request #16514 from Qwertytoforty/Exchanging-positions 
Makes heat exchangers not dense
 2021-08-14 11:01:08 -04: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
d2d2af6a14 Merge pull request #15952 from farie82/runtime-fixes-6 
Fixes 4 runtimes. Linked forum account message is now shown properly
 2021-08-11 16:06:57 -04:00
Qwertytoforty
f688a9c689 Makes heat exchangers not dense 2021-08-10 18:26:13 -04:00
S34NW
ea87e351a2 Merge branch 'master' into tgglassfloors 2021-08-05 15:17:09 +01:00
Qwertytoforty
b8e84c73bf Prevents vents / scrubbers from making air from walls (#16236) 
* Prevents getting free air from walls

* Almost forgot
 2021-07-27 19:26:11 -04:00
AllStickyGithub
24d3391a3c Added a thermostat on/off button. Tweaked target temp button. (#16016) 
* Added a thermostat on/off button. Fixed target temp button.

Co-authored-by: dearmochi <shenesis@gmail.com>
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
Co-authored-by: variableundefined <40092670+variableundefined@users.noreply.github.com>
 2021-07-27 12:50:18 -04:00
variableundefined
ce22fb12c2 Merge pull request #16312 from theo-3/cryoeject 
Make cryo start with auto eject enabled
 2021-07-26 20:40:48 -04:00
variableundefined
1cc930ae20 Merge pull request #15404 from SteelSlayer/atmos-alt-control-click 
Gives better feedback when control or alt-clicking pressure pumps, volume pumps, etc.
 2021-07-26 20:14:49 -04:00
SteelSlayer
d5ecfc3ae4 sabre changes 2021-07-26 19:07:07 -05:00
SteelSlayer
c18c177002 remove useless returns 2021-07-26 19:07:07 -05:00
SteelSlayer
9659fbd0f8 atmos-alt-control-click 2021-07-26 19:07:06 -05:00
variableundefined
8dd75c4876 Merge pull request #15944 from PidgeyThePirate/Issue_15662_Welderbombs_Ignore_Suits_Fix 
#15662 Fix - Makes welder bombs resistable by heat resistance
 2021-07-26 20:05:15 -04: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
S34NW
1d6c572729 Merge branch 'master' into tgglassfloors 2021-07-20 17:35:28 +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
theo-3
e4f4dc51d4 Fix typo 2021-07-12 19:07:33 +03:00
theo-3
116c4e7004 Make cryo start with auto eject 2021-07-06 03:48:27 +03: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
Arvenius169
1202954e09 Replaces all occurrences of the between() proc with the native clamp() proc 2021-06-02 17:31:05 -04:00
SteelSlayer
e4bbd94d6a Robot_module and cyborg stack refactor (#13527) 
* robot_module refactor

* some fixes

1. adds medical stacks of 25 for the syndi medical borg
2. fixes various construction steps that weren't using `use()` or `get_amount()`

* review tweaks + other stuff

1. Makes a bunch of for loops into istypeless loops
2. Adds a readout of the current out of stacks a borg has, in the status panel
3. Slightly reorganizes the medical, syndi medical, engineering and syndi engineering cyborgs items

* fixes after upstream merge

* blank line for travis

* fixes and improvements

1. Fixed welder icon's not updating periodically if you were charging in a borg recharger
2. Fixes solar panels dropping /cyborg type glass when they were deconstructed.
3. Band-aid fix (incase #2 doesn't fix this) for cyborg stack's `source` var being null which resulted in tons of "cannot read null.energy" runtimes

* more fixes + constructable frame runtime fix

* removes toy sword placeholder

remove comment

* remove these as well

* .amount to .get_amount(), really should have done this before

* refactors robot_upgrades to work with the new system

- more cleanup
- adds documentation
- fixed a bug I made where you could delete your robot stack via crafting

* moves some unemag logic to the module file, makes more loops typless

* farie review

* fox review

* affected review and more TM bugfixes

* fixes comment

Co-authored-by: SteelSlayer <SteelSlayer@users.noreply.github.com>
 2021-05-24 16:24:25 +01:00
S34NW
05e2435c9b fixes scrubber and vent connector jank 2021-05-24 12:06:38 +01:00
joep van der velden
96d35bd7ca Optimizations. Saves about 20% CPU time 2021-05-06 16:32:46 +02:00
joep van der velden
277c8e2ca6 More fixes 
Moves logging around
Refactor of code
 2021-05-05 22:17:09 +02:00
joep van der velden
590ca6cd5d Fixes fireflashes 
Fix fuel tanks going off multiple times.
Fix other reagents going off multiple times
Fireflashes now don't go through things they shouldn't be able to
 2021-05-05 21:41:38 +02:00
joep van der velden
70d201b312 Fix 3 runtimes. 
Air alarms should be made to just use Init later on
 2021-04-26 21:07:27 +02:00
Pidgey
8a64f1bec1 Accidentally made the explosions MORE powerful against unarmored individuals. Fixed that. 2021-04-24 16:59:35 +10:00
Pidgey
b1549ae272 Fireballs from the fireflash and fireflash_s procs have the body temperature increase resisted by heat resistance. 2021-04-24 16:32:11 +10:00
S34NW
c7db5e0d16 fixes final steelslayer issue 2021-04-23 20:58:28 +01:00
S34NW
d50c7273fc more fixes 2021-04-23 19:55:09 +01:00
S34NW
da9b4a80c9 mochi review 2021-04-22 20:53:46 +01:00
S34NW
d2a446044c fixes pipe issues 2021-04-22 19:32:15 +01:00
S34NW
cce71b734d no pipe interaction, metal swapping, transparency 2021-04-22 10:20:45 +01:00
S34NW
fbf958b6fc bad code, but tidier code 2021-04-21 23:42:20 +01:00
S34NW
11d46098cb i can see clearly now the plating's gone 2021-04-21 22:29:34 +01:00
Fox McCloud
114f31703c Merge pull request #15693 from mafemergency/fix_tile_atmos_overlay 
fixes tile atmos overlays going invisible
 2021-03-13 18:06:14 -05:00