cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-06-20 21:03:27 +01:00
Code Issues Packages Projects Releases Wiki Activity
26,993 Commits 10 Branches 2 Tags
33f6a2bb2ad778f00a33dcd9f0bd4143c97d4450
Commit Graph

2041 Commits

Author SHA1 Message Date
Tastyfish fe7fbbeb9f Allows voice activators, etc to work in storage items 2016-03-25 20:13:18 -04:00
Fox McCloud aac7986622 Merge pull request #3972 from FlattestGuitar/confetti_2_sigh 
Adds party grenades
 2016-03-24 13:03:34 -04:00
Mieszko Jędrzejczak 3b514ddacb Things 2016-03-23 22:42:30 +01:00
Mieszko Jędrzejczak 135687fe7e Adds party grenades 2016-03-23 12:11:39 +01:00
Fox McCloud fb7cb2cf65 Merge pull request #3944 from DaveTheHeadcrab/hitmanTators 
Adds Fiber Wire
 2016-03-22 21:01:07 -04:00
SamCroswell 3d22908221 Stun Value Adjustments 2016-03-21 23:07:19 -04:00
SamCroswell f983245c3f Garrotes, Commit 2 2016-03-21 20:31:55 -04:00
SamCroswell 394657256c Traitor Garrote, Initial Commit 2016-03-21 00:25:31 -04:00
TheDZD 854420bc74 Merge pull request #3911 from KasparoVy/ipc-fbp-resolved 
IPC-FBP Customization
 2016-03-20 18:43:51 -04:00
Fox McCloud 0d24763e35 Merge pull request #3920 from Crazylemon64/cleaner_dna_application 
Makes DNA swapping methods more reliable and other appearance tweaks
 2016-03-18 21:37:20 -04:00
Crazylemon64 d748ef23b8 Makes DNA swapping methods more reliable 
- Makes heads keep hair on removal
- Amputated limbs from a DNA-injected individual now will keep their
  appearance of the DNA-injected person
- Wounds will now vanish on their own now
- Admins now have an "incarnate" option on the player panel when viewing
  ghosts for quick player instantiation
- Fixes a runtime regarding failing a limb reconnection surgery
- Copying a client's preferences now overrides the previous mob's DNA
 2016-03-17 23:07:45 -07:00
KasparoVy 98285c0518 No longer, I hope. 2016-03-17 20:37:41 -04:00
TheDZD 85e2f1f0ab Merge pull request #3898 from Fox-McCloud/addiction-rework 
Addiction Rework
 2016-03-16 21:46:18 -04:00
TheDZD be3c313189 Merge pull request #3887 from Fox-McCloud/bag-of-holding 
Bag of Holding Tweak
 2016-03-16 21:45:52 -04:00
Fox-McCloud efe1871595 Addiction Rework 2016-03-15 18:36:29 -04:00
Fox-McCloud 1af9e77382 Bag of Holding Tweak 2016-03-14 19:02:56 -04:00
Tastyfish 96e0d10f8e flavor tweaks 2016-03-14 05:26:05 -04:00
Fox McCloud 5abd9d3ea8 Merge pull request #3848 from Tastyfish/tanknozzle 
Allows tank nozzle to be pulled out while on janicart
 2016-03-13 20:42:25 -04:00
TheDZD de8fb4345c Merge pull request #3836 from Fox-McCloud/chem-tweaks 
Chem tweaks
 2016-03-12 20:20:33 -05:00
Tastyfish 033b3d82ab Allows tank nozzle to be pull outable while your hands are free but buckled eg to a janicart 2016-03-11 18:59:56 -05:00
Tastyfish 1bb98edc0d Refactors vampire abiliies to be spells 2016-03-10 07:01:31 -05:00
Fox McCloud 87155ff7d3 Merge pull request #3802 from Tastyfish/chronx100 
Donator Fluff Items: Chaplain Edition
 2016-03-10 03:54:19 -05:00
Fox-McCloud 2dfe617998 Chem Tweaks 2016-03-10 00:28:49 -05:00
TheDZD 62afa9d6d3 Merge pull request #3791 from Fox-McCloud/goon-immersion-sounds 
Implements a Few Goon Sounds
 2016-03-09 17:08:05 -05:00
Tastyfish 959b71ca37 Adds fluff items for chronx100 2016-03-08 23:15:13 -05:00
Fox-McCloud 2268e3c39e Implements a Few Goon Sounds 2016-03-07 23:54:12 -05:00
VampyrBytes 1148bde3a6 eating refactor (#3733) + bugfixes 
Ok, messed up resolving the merge conflicts (first try), so doing a
fresh pr. This turned out to be a good thing, as after I put the changes
back I tested again, and found 2 bugs (not due to my code)

Firstly, the organ refactor had introduced a bug when taking liver
damage from being drunk. It wasn't getting the liver correctly, leaving
it with null, and was then trying to damage it.

The second was related to the amount you took in when drinking
 2016-03-05 08:03:39 +00:00
Fox McCloud ab490f7fd9 Merge pull request #2903 from Aurorablade/OrganRefactor 
[HOLY SHIT!]Charlie, lets go to candy mountain, charlie
 2016-03-04 19:51:50 -05:00
Crazylemon64 b095d40952 i r inteligunt 2016-03-01 12:11:08 -08:00
Crazylemon64 d72a086cd5 Makes the DNA scrambler not give incorrect hairstyles 2016-03-01 11:40:39 -08:00
Crazylemon64 fff283bd2a Organs now properly retain appearance upon cloning and DNA scramble 2016-02-29 22:49:46 -08:00
Aurorablade 5f98feb0bc meanwhile as i driver tiger INSANE 2016-02-25 16:17:39 -05:00
Fox-McCloud a4c61c7ee9 Ports Whetstones 2016-02-25 02:03:53 -05:00
Aurorablade 9a804ebd31 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-24 06:27:16 -05:00
VampyrBytes 6afc8258a8 Adds same fix to secure storage 2016-02-24 06:54:56 +00:00
VampyrBytes c343619ebc removes unneeded brackets 2016-02-23 23:39:54 +00:00
VampyrBytes b138c3eace prevents autoequip to locked lockboxes 2016-02-23 10:05:32 +00:00
Fox McCloud a0263f9c89 Merge pull request #3652 from Crazylemon64/warm_regards 
You can now light cigarettes off of burning mobs
 2016-02-21 01:27:11 -05:00
Fox McCloud 941d992920 Merge pull request #3655 from VampyrBytes/washrefactor 
refactors washing items
 2016-02-20 17:41:53 -05:00
Fox McCloud c69d0b877c Merge pull request #3656 from pinatacolada/protectstation 
Makes the Protect Station board no longer consider people crew, instead of human
 2016-02-20 15:35:35 -05:00
pinatacolada 90678a4c28 Makes the Protect Station board no longer consider people crew, instead of human"" 
I'm guessing this was an oversight?
 2016-02-20 14:01:53 +00:00
VampyrBytes 386ed87126 refactors washing items 
fixes #3570
Could have fixed with another if statement in sink/attackby, but it was
already pretty snowflakey, and had the potential to get worse
Items now have a wash proc that the sink calls, that can be overridden
when needed
 2016-02-20 12:01:40 +00:00
Fox McCloud 716edf2533 Merge pull request #3634 from KasparoVy/packbackets 
Vox-fitted Back Stuff, Adds Genetic Duffel, Fixing Typos and Refactoring Back-Icon Generation
 2016-02-20 02:20:16 -05:00
Fox McCloud 2c4dfb18e5 Merge pull request #3564 from Crazylemon64/better_defibs 
Might make the defib more reliable on players who have ghosted
 2016-02-20 02:18:55 -05:00
Crazylemon64 6d30b44ac6 You can now light cigarettes off of burning mobs 2016-02-19 21:20:04 -08:00
Crazylemon64 250e07a915 bluh 2016-02-19 21:05:48 -08:00
Crazylemon64 ae3ab870f8 Adds the recommended fixes 2016-02-19 20:42:25 -08:00
Aurorablade 570dd619b7 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-18 19:01:41 -05:00
KasparoVy 679218b952 Vox-Fitted Back Stuff, Adds Geneticist Duffel, Fixing Typos and Refactoring Back Icon Generation 
Using species_fit and sprite_sheets now works properly for items worn on
the back. Previously it was using the item_state name if it existed in
order to generate the on-mob icon, which was wrong. I restructured it to
work the same way as the rest of the icon generation procs.
 2016-02-18 14:59:28 -05:00
Fox McCloud 5f0736e2ed Merge pull request #3624 from Tastyfish/i-have-no-mouth-and-i-must-fork 
Stops utensils from working on mouthless humanoids.
 2016-02-18 13:36:55 -05:00