cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-25 09:41:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,092 Commits 26 Branches 2 Tags
4e40353cfa9375bcf2ebd1182e4591663d36fedc
Commit Graph

995 Commits

Author SHA1 Message Date
SabreML
9e662aa714 Neural Jumpstarter implant (#16891) 2021-10-07 17:51:17 +01:00
variableundefined
1954e619fa Merge pull request #16845 from Exavere/Golem-Magic 
Fixes Golems not being properly augmented
 2021-10-03 20:48:33 -05:00
Vi3trice
01d586e791 Like suit storage, no reason not to drop the item 2021-10-03 10:23:29 -04:00
Exavere
32a0adb5c8 Fixes Golems not being properly augmented 2021-10-01 16:10:33 -05:00
Fox McCloud
4e0c76ac63 Merge remote-tracking branch 'upstream/master' into diagnostic-hud-fixes-and-upgrade 2021-09-30 18:16:10 -04:00
Exavere
e0df52c918 Update code/modules/surgery/organs/lungs.dm 
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
 2021-09-21 11:34:38 -05:00
Exavere
23e4357e4d Making Plasmamen not emote "coughs up blood" 2021-09-20 20:07:12 -05:00
adrermail@gmail.com
b9344a258e Diona limbs now ACTUALLY properly augment children 2021-09-11 20:05:23 +02:00
variableundefined
20b59aff45 Merge pull request #16389 from Qwertytoforty/reviving-revivers 
Lets revivers potentially heal you out of shock
 2021-07-26 20:35:35 -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
Samman166
64349fa7db Adds hardened versions of thermal and x ray eyes and replaces old ones bought by nuke ops (#16055) 
* Adds hardened versions of thermal and x ray eyes and replaces old ones bought by nuke ops

* Update code/modules/surgery/organs/eyes.dm

grammar changes

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

* gives SOOs hardened X-ray eyes

* Grammar fix

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2021-07-25 13:38:43 +01: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
Qwertytoforty
216e80303b Lets revivers potentially heal you out of shock 2021-07-18 10:37:13 -04:00
dearmochi
712721fbc6 [READY] Reworks and Refactors Hallucinations (#15360) 
* Hallucination rework start

* Chaser/Attacker, Abduction

* Moderates

* Majors

* saber alter

* address SteelSlayer

* Fix admin logging and runtime

* put hallucination logging on ATKLOG_ALL
 2021-07-13 14:27:14 +01:00
AffectedArc07
9ddf4ceb97 Merge remote-tracking branch 'ParadiseSS13/master' into toml-config 2021-07-09 11:42:23 +01:00
SabreML
c266b27aed Another small bugfix bundle (#16260) 
* Closet examine

* Lit welder inhands

* Capitalisation

* Cyber organ eating

* Nukie reinforcements code

* Welding tool lathe cost

* Patch pack dropping

* Welding tool fix

* Spacing

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

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2021-06-26 22:57:27 +01:00
AffectedArc07
ed11899f11 Merge branch 'master' into toml-config 2021-06-23 08:44:32 +00: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
AffectedArc07
7486d026b7 READY 2021-05-23 17:26:17 +01:00
hal9000PR
9c4b73be1e Fixes self surgery with beds (#16004) 
* fix

* mochi's suggestion. added check for self surgery starting

* line
 2021-05-16 09:37:25 +01:00
Fox McCloud
6eeb10b441 Merge pull request #15725 from dearmochi/eyes-default-lighting-alpha 
Give eyes default lighting alpha of LIGHTING_PLANE_ALPHA_VISIBLE
 2021-05-15 10:49:12 -04:00
SabreML
fb06547f97 Various bugfixes (#15873) 
* pAI Record Fix

* AI Respawnability

* Wine Reagents

* Ghost Repulsing

* Agent ID Card Numbers

* Maint Drone Lights

* Fix fixes

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

* Headpocket runtimes

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2021-04-19 14:50:30 +01:00
Qwertytoforty
e2793017bc preventions and fixes (#15726) 2021-04-05 17:46:43 +01:00
Sean Williams
08df09afb8 Cuffs now block arm implant use (#15825) 
* no more implant interaction with cuffs

* delete pascal case
 2021-04-05 15:49:35 +01:00
Adrer
4602b84d33 Diona/unbreakable limbs now properly augment children (#15826) 
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
 2021-04-05 15:47:20 +01:00
mochi
ef07325a9a Give eyes default lighting alpha of LIGHTING_PLANE_ALPHA_VISIBLE 2021-03-17 11:48:49 +01:00
Qwertytoforty
9ee679cded Adds more magic items and spells to the wizard spellbook (#15036) 
* touches more or less everthing that is magic

* Other changes I forgot to put in

* removes extra s

* nevermind lets not do drake form

* Apply suggestions from code review

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

* Better variable name

* Heart curse removed

* Re adds new stuff

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2021-03-14 10:15:05 +00:00
AffectedArc07
f2770ed6be Merge remote-tracking branch 'ParadiseSS13/master' into brutal-part1 2021-03-11 18:41:17 +00:00
Fox McCloud
fdc6ab2211 Damns Devils Gamemode to Hell (#15672) 
* Damns Devils Gamemode to Hell

* Update config.txt
 2021-03-07 12:00:02 +00:00
Fox McCloud
8064242b75 Fixes Skrell Headpockets (#15660) 
* Fixes Skrell Headpockets

* grammar fixes
 2021-03-05 14:51:47 +00:00
Fox McCloud
926d484277 Moves External Organs to Nullspace (#15548) 
* Moves External Organs to Nullspace

* additions

* oops

* further cleanup
 2021-03-03 21:34:49 +00:00
Fox McCloud
75935ff876 Converts Eye Augments to Cybernetic Eyes (#15519) 
* Converts Eye Augments to Cybernetic Eyes

* literally not used

* it helps when you properly include all the code

* flashlight eyes

* tweaks

* conflict resolution

* can't have two eyes

* order of operations matters here

* autosurgeon
 2021-03-03 20:21:30 +00:00
Fox McCloud
f65c8994ce Broad TG Sound Update (#15608) 
* Broad TG Sound Update

* jester update
 2021-02-27 11:59:33 +00:00
Fox McCloud
c73cc5aa68 Refactors Organ Shocking To Use Signals (#15593) 
* Refactors Organ Shocking To Use Signals

* proper source

* hush you
 2021-02-26 18:43:11 +00:00
Fox McCloud
b49a99d46e Ports Physiology (#15449) 
* Ports Physiology

* updates
 2021-02-26 18:33:28 +00:00
Fox McCloud
efa3aecb61 Ports TG Pickup, Equip, and Drop Sounds (#15572) 
* Ports TG Pickup, Equip, and Drop Sounds

* really
 2021-02-24 12:51:59 +00:00
Fox McCloud
7b7ea0a191 Removes Deformed Sprites (#15588) 2021-02-24 12:45:58 +00:00
Fox McCloud
78cb60f160 Fixes Some Sounds Having Reverb (#15602) 
* Fixes Some Sounds Having Reverb

* typeless
 2021-02-24 09:34:34 +00:00
Fox McCloud
02b9445b9b Refactors DNA Mutations; Refactors Mutations to use Traits (#15483) 
* Refactors Mutations

* traits

* more work

* styling fix

* yet even more work

* oh hush

* almost there

* it continues yet further

* and that's genetics done

* and that's it folks

* last bit and golem fixup

* oof

* oops

* tweaks and fixes

* styling
 2021-02-21 21:25:19 +00:00
Kyep
c9f587010e fix (#15467) 
Co-authored-by: Kyep <Kyep@users.noreply.github.com>
 2021-02-07 21:33:11 +00:00
AffectedArc07
f5f97882cf BRUTAL Part 1 - No proc var/ in procs 2021-02-01 14:10:08 +00:00
Fox McCloud
003a1f7cba Tank Refactor; Breathing Retool (#15371) 
* Tank Refactor Breathing Retool

* missed maps and doc

* just in case
 2021-01-28 20:57:37 +00:00
Fox McCloud
de795c4e31 Radiation Refactor (#15331) 
* First Commit

* visible radiation and engine goggles

* correction

* t-ray fix

* further adjustments and fixups

* gieger addition and cleaning fixup

* yet more fixes

* styling fixes

* fixes

* human glowing fix

* do the merge conflict avoidance dance

* Update supermatter.dm

* supermatter rads

* mapping in

* radiation doors

* yeah yeah line endings

* clean up

* styling issues

* showers
 2021-01-24 22:03:13 +00:00
datlo
9e4061a796 Update grey translator implant to have a proper EMP effect (#15323) 
* Add a proper emp_act to translator implant

Getting EMP'd as a grey with a translator now causes 20 brain damage and shuts down the translator for a minute.

* Remove brain damage
 2021-01-24 13:34:49 +00:00
SabreML
5aeede675b Fixes one handed dswords (#15289) 
* One handed deswords

* Reverts unintended changes

Got a bit confused, I need more coffee
 2021-01-20 09:54:26 +00:00
Kyep
6d2c211688 Fixes organs_internal:295 runtime (#15171) 
Co-authored-by: Kyep <Kyep@users.noreply.github.com>
 2020-12-22 18:08:10 +00:00
Qwertytoforty
dad7d8c08b Fixes vocal cords (#15116) 2020-12-15 18:56:26 +00:00
dearmochi
49853973e7 Buff EMPs against augments, remove duplicate external organ emp_act (buffs IPCs vs. EMPs) (#14813) 
* Buff EMPs against augments, remove duplicate external organ emp_act

* Remove losebreath/toxloss
 2020-12-09 12:15:27 -05:00
dearmochi
5edee29a50 [READY] Syndicate Contractors (#14605) 
* Syndicate Contractors initial PR

* Finalize initial version

DNP

Finalize initial version

* Baton now costs 6 Rep, show dead extraction penalty, fix scroll

* Reduce total TC, add zippo, balloon, icon tweaks

* Address moxian, AA and Farie

* Fix mode.txt

* oops

* Address Farie 2

* Tweak baton to work around stam crits, address SteelSlayer

* Address TM issues, TP menu

* Fix wrongly merged DME

* Tick contractor DM files again

* Remove step_y

* TC rewards always higher than preceding difficulty's reward

* Address Farie

* Remove extraction_turf from handle_target_return

* fix doc

* Merge part2

* Address AA again
 2020-12-09 12:03:23 -05:00