cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-19 10:06:56 +01:00
Code Issues Packages Projects Releases Wiki Activity
28,355 Commits 17 Branches 2 Tags
b45ef2da5d2847a64382d14623ac7909aacbfda0
Commit Graph
331 Commits
Author SHA1 Message Date
KasparoVyandFox McCloud b45ef2da5d Dethralling a Shadowling Thrall Clears Darksight if it's Activated (#4682) 2016-06-15 05:34:41 -04:00
Twinmold93andFox McCloud 674bfe5d08 No Longer Can Eat Cybernetic Implants (#4669) 
This makes is so you can no longer eat cybernetic implants improperly,
just because they are in organ code. Fixes the check that originally
made it so you couldn't eat them.

🆑 Twinmold
Fix: Fixes being able to eat cybernetic implants so you cannot eat
them/force feed them to people.
/🆑
 2016-06-14 17:55:40 -04:00
Fox McCloud 695cde670a Merge pull request #4515 from TheDZD/why-did-i-try-doing-this-again 
Major Gun Refactor
 2016-06-08 22:49:10 -04:00
Fox McCloud 3594337638 Merge pull request #4558 from monster860/cluwne_voice 
Adds comical implants
 2016-06-07 09:31:02 -04:00
Tastyfish 57abc28c73 Fixes holsters and potentially other accessories with action buttons 2016-06-01 20:30:57 -04:00
monster860 073aad1211 lein nutes 2016-06-01 18:11:52 -04:00
monster860 9d3a6fc979 Comical implants 2016-06-01 16:43:36 -04:00
TheDZD 8dcf46bf91 Sprites & fixes 2016-05-31 22:50:57 -04:00
TheDZD 824a55bf8a Merge pull request #4532 from monster860/surgery_fix 
Fix some IPC surgeries not working
 2016-05-29 12:00:06 -04:00
monster860 9978bcbec6 Fix some IPC surgeries not working 2016-05-29 11:52:57 -04:00
Tastyfish 7efe0beb94 Fixes a few runtimes 2016-05-23 19:23:18 -04:00
Fox McCloud b3e07fdbcf Merge pull request #4446 from KasparoVy/fix_rejuv 
Fixes #4435, Refactors Rejuvenation, Fixes Flipping Runtime
 2016-05-22 18:39:38 -04:00
Fox McCloud 0f3d69fadc Merge pull request #4474 from Tastyfish/reagent-air 
Standardizes behavior of a few reagents
 2016-05-21 20:37:20 -04:00
HugoLuman 61d36843f7 Refactors MMI.dm to remove type-checks for brain sprites, 
aside from the xeno brain, which does other stuff within its type check.

Signed-off-by: HugoLuman <qaggeler@uci.edu>
 2016-05-20 14:23:55 -07:00
Tastyfish afe2aa8e31 Makes gas reagents have standardized behavior, skrell liver behavior generalized 2016-05-20 04:27:59 -04:00
KasparoVy 701df43ee0 Doesn't Rejuvenate Limbs or Organs if ones Exist on Mob... 
... with the same limb name (in the case of external organs) or the same slot (in the case of internal organs) to prevent duplication.
 2016-05-18 23:59:12 -04:00
KasparoVy 548a4681f1 Just a bit of housekeeping. 2016-05-18 23:59:09 -04:00
KasparoVy 5cdaa4c90a Rejuvenating Organs will now Clear Disfigurement of the Head 2016-05-18 23:59:06 -04:00
KasparoVy 4f05d7b3f5 Rejuvenation Fix/Refactor Pass 1 2016-05-18 23:59:05 -04:00
TheDZD 42bca48c0e Merge pull request #4458 from KasparoVy/diona_fix 
Fixes a Horrible Diona Runtime [Probably Urgent]
 2016-05-18 18:52:01 -04:00
KasparoVy 196a897444 Diona Fix 
Repaths Diona bodyparts to fix a runtime.
 2016-05-18 17:49:47 -04:00
TheDZD cb5f572969 Merge pull request #4423 from Fox-McCloud/foam 
Foam Fixes+Changes
 2016-05-16 20:15:39 -04:00
Fox-McCloud e22bc8a42b Foam Fixes+Changes 2016-05-12 23:47:30 -04:00
KasparoVy 13003fe351 Merge branch 'temp2' into temp 2016-05-10 00:10:15 -04:00
pinatacolada bc1eeb432b betterlocatorinos 2016-05-04 21:49:35 +01:00
pinatacolada 0f3f961ce0 locatorinos 2016-05-04 20:56:27 +01:00
pinatacolada 7e0b1302ec prevents implanting fukken disks in boxes inside of people 
fixes #4347
 2016-05-04 14:31:43 +01:00
KasparoVy b1001910b9 Typo. 2016-05-03 19:59:31 -04:00
KasparoVy f95655419c Refactors Hair so it's on the Head + Adds a Vox Hairstyle + Adjusts Vox Hairstyle Names for Consistency -- PASS 1 
Also fixes a typo or two.

TO DO: FULLY TEST AND SWEEP FOR BUGS, ERRORS AND RUNTIMES
 2016-04-30 08:12:41 -04:00
HugoLuman 5915619c4d Merge branch 'master' of https://github.com/QuinnAggeler/Paradise into Paradise-drask 
# Conflicts:
#	icons/mob/human_face.dmi
 2016-04-26 17:32:04 -07:00
KasparoVy 401f31643d Attaching a prosthetic head that isn't a monitor won't cause you to go bald & Fixes disembodied prosthetic heads being bald & ... 
cont'd: Adds the rendering of markings on disembodied heads.
 2016-04-21 19:59:11 -04:00
KasparoVy 3b435c023a Refactor scissors, fix and finalize prefs, fix missing part definition for xion models, etc. 
continued: Monitor changing verb will now only show a list of monitor
styles available for the monitor head brand you are using.

For example, if you chose any of the regular monitor heads (default
morpheus or anything suffixed with mtr.) you will get a list of IPC
standard monitor styles and nothing else.
However, if you chose the hesphiastos alt head (which is also a monitor,
but of a different style) the list will be populated with the monitor
styles suitable for that hesphiastos head, but none others (not even the
ipc standard ones, since those don't fit and hesphiastos alt. isn't in
the models_allowed list)
 2016-04-21 19:59:09 -04:00
KasparoVy a9ee7ea97e PASS 1 
TO DO: SCISSORS AND SHAVER REWORK
 2016-04-21 19:58:37 -04:00
HugoLuman 18aaaa9366 Resolves conflict in interface/stylesheet.dm 
The new stylecolor for Abductors used the same line as the Drask's

Signed-off-by: HugoLuman <qaggeler@uci.edu>
 2016-04-20 14:44:24 -07:00
MarsM0nd d307eb9794 Fixes #4127 
Reverts back to hemostat and alternatives for embeded object surgery.
 2016-04-16 15:10:29 +02:00
Fox McCloud f9a74914e2 Merge pull request #4173 from KasparoVy/head-accessory-fix 
Head Accessories No Longer Hidden by BLOCKHEADHAIR
 2016-04-14 20:22:00 -04:00
HugoLuman f6c48c187e Removes commented-out and unused code from organ files, removes pointless can_revive_by_healing from drask.dm 
Signed-off-by: HugoLuman <qaggeler@uci.edu>
 2016-04-12 20:19:56 -07:00
HugoLuman b95cdecb89 Fixes merge conflict 
Signed-off-by: HugoLuman <qaggeler@uci.edu>
 2016-04-12 19:26:34 -07:00
HugoLuman 71ad25c01c Merge branch 'Paradise-drask' of https://github.com/QuinnAggeler/Paradise into Paradise-drask 
# Conflicts:
#	code/modules/mob/living/carbon/human/species/drask.dm
#	code/modules/surgery/organs/subtypes/drask.dm
 2016-04-12 19:16:57 -07:00
HugoLuman 03323686d4 Drask files 
Signed-off-by: HugoLuman <qaggeler@uci.edu>
 2016-04-12 19:00:29 -07:00
HugoLuman 46bd72ac5e Drask files 
Signed-off-by: HugoLuman <qaggeler@uci.edu>
 2016-04-12 18:06:35 -07:00
KasparoVy 41684a577c Fixes Issue With Head Accessories 
Vulpkanin facial markings and Unathi horns will no longer magically
disappear when you wear something that hides hair. Now works in the same
manner as facial hair, being persistent

Fixes an issue where the facial markings of Vulpkanin and the horns of
Unathi Surgeons would disappear when they wore their surgical cap (i.e.
at spawn) and not regenerate without two triggers
 2016-04-12 02:08:31 -04:00
Aurorablade 3dcb3dfb3c lemons suggestions...kind of... 2016-04-10 22:25:52 -04:00
Aurorablade f883e06c2e Adjustments 2016-04-09 22:27:53 -04:00
Aurorablade fab0a1ef17 I HATE EYEBALLS 2016-04-09 00:48:15 -04:00
Tigercat2000 bb5e3bca63 Fix remaining issues and sound shit 2016-04-05 16:26:11 -07:00
Tigercat2000 78f53553f8 Reduce lines by removing blank lines added by PJ's script 2016-04-05 08:25:57 -07:00
Tigercat2000 9d430844c3 Replace most (if not all) output << operators with to_chat(user, message) 
Currently, to_chat is literally just a proc that does user << message.
But it'll let us do output modification in the future, especially for
something like Goon's HTML chat.

Big thanks to PJB for his to_chat script, see
https://github.com/d3athrow/vgstation13/pull/6625 for more details.
 2016-04-05 08:15:05 -07:00
Fox McCloud a30b5fbf75 Merge pull request #4076 from Aurorablade/ICUTYOU 
Fixes IPC Embbedded object surgery
 2016-04-03 01:24:28 -04:00
Aurorablade e045e10268 remoing pasted line 
i need to remove the rest of em later.
 2016-04-02 23:42:14 -04:00