cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-03-31 01:22:03 +01:00
Code Issues Packages Projects Releases Wiki Activity
27,240 Commits 12 Branches 2 Tags
f883e06c2ea881dfd3d7e02d0e86ec3bdaa4fa00
Commit Graph

2050 Commits

Author SHA1 Message Date
Fox-McCloud
3f7f6704c8 Xenobio Refactor/Changes 2016-04-06 01:37:04 -04: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
b3b0abd95b Fixes Weakeyes 2016-04-03 01:19:49 -04:00
Fox McCloud
752d106bef Merge pull request #4067 from tigercat2000/510staging 
Merge branch 'byond510' into master
 2016-04-02 22:44:00 -04:00
Tigercat2000
7a41efd1da Last staging fixes 2016-04-01 16:09:43 -07:00
Tigercat2000
519992b5a9 Merge branch 'byond510' 
Conflicts:
	.travis.yml
	code/game/jobs/access.dm
	code/game/machinery/camera/camera.dm
	code/game/machinery/flasher.dm
	code/game/machinery/vending.dm
	code/game/objects/items/devices/laserpointer.dm
	code/game/objects/items/weapons/grenades/flashbang.dm
	code/game/objects/items/weapons/tools.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/species/species.dm
	code/modules/mob/living/life.dm
	code/modules/mob/living/silicon/silicon.dm
	code/modules/mob/living/simple_animal/bees.dm
	code/modules/nano/modules/virus2_creator.dm
	code/modules/virus2/disease2.dm
	code/modules/virus2/diseasesplicer.dm
	paradise.dme
 2016-04-01 14:15:44 -07:00
FalseIncarnate
777f8cbfb6 Beaker and Pill Bottle Labeling 
Can now label Pill Bottles with pens, just like Beakers

Beakers (and pill bottles) can now accept 26 character labels from pens.
 2016-04-01 15:17:47 -04:00
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
Tigercat2000
0c9a469f2c 510: HUD, Flash Refactor, Rip out unused pain system 2016-02-28 18:09:43 -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