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

1015 Commits

Author SHA1 Message Date
Farie82
e837482575 Embedded objects stay embedded on dismembered limbs. Can be removed by sharp objects (#16839) 2021-12-03 13:24:05 +01:00
Charlie
31b336da64 minor external organ refactor (#16183) 
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com>
 2021-12-01 22:17:44 +01:00
mochi
6bf0d516d3 Fixes a runtime on organ processing 2021-11-14 21:39:36 +01:00
Fox McCloud
78158de886 Optimizes Organ Processing (#17096) 2021-11-14 09:37:50 +01:00
Fox McCloud
8061afa550 Merge pull request #16172 from dearmochi/hair-gradients 
[READY] Port hair gradient customization
 2021-11-11 15:40:21 -05:00
variableundefined
97a88da9a9 Merge pull request #16895 from lewcc/vomit-comet 
Nutriment Pump Implants make you projectile vomit when EMPed
 2021-11-05 08:38:30 -05:00
mochi
c7046c0756 Merge branch 'master' into hair-gradients 2021-10-27 13:33:12 +02:00
Luc
431c1fe368 Update code/modules/surgery/organs/pain.dm 
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2021-10-26 16:03:45 -04:00
lewcc
2c20cce543 Ehhh why not 2021-10-25 20:04:37 -04:00
lewcc
cf5f487ac9 Clean up pain messages a bit more 2021-10-25 20:01:51 -04:00
lewcc
f7999fee26 Add more organ pain messages 2021-10-25 19:47:58 -04:00
lewcc
8af58be3d9 Move examine text addition to examine proc 2021-10-18 16:46:33 -04:00
Luc
41e6eefc07 Add missing span 
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2021-10-14 10:48:45 -04:00
lewcc
b6c1ef9ec7 Update to use owner.visible message 2021-10-13 19:57:52 -04:00
Luc
7a18aa254e Apply suggestions from code review 
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2021-10-13 19:46:49 -04:00
lewcc
181b63f1d2 Add hardened versions of nutriment implants 2021-10-09 15:38:27 -04:00
lewcc
13a74daca2 Adds vomiting behavior to nutripump emp 2021-10-08 01:27:14 -04:00
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
dearmochi
dbab95dd96 Merge branch 'master' into hair-gradients 2021-07-27 18:35:55 +02:00
dearmochi
502258e348 Merge branch 'master' into hair-gradients 2021-07-27 18:28:46 +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
mochi
ca78e5f311 Add hair gradient customization 2021-06-13 10:55:21 +02: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