cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-30 04:02:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,134 Commits 26 Branches 2 Tags
a36ec06fc2cb037870ef680fe99eee31fea6efbe
Commit Graph

5304 Commits

Author SHA1 Message Date
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
Fox McCloud
80ae4bff80 Merge pull request #4045 from ProperPants/Cyborg_Stacks 
Cleaning and Definition of Cyborg Stacks
 2016-03-31 22:24:19 -04:00
Tastyfish
6a8ea815b2 Merge branch 'master' into buttbots2 
Conflicts:
	code/defines/procs/AStar.dm
	code/modules/mob/living/simple_animal/bot/cleanbot.dm
	code/modules/mob/living/simple_animal/bot/medbot.dm
	paradise.dme
 2016-03-31 13:33:46 -04:00
ProperPants
0f9797a7c2 Cyborg wood is gone. I don't know why it was there in the first place. 2016-03-31 08:18:39 -04:00
ProperPants
b764f18840 I forgot to change the cyborg modules back to normal for the tiles. 2016-03-30 22:16:09 -04:00
ProperPants
2b4456c12f Cleaned up some cyborg stacks to take almost everything from the parent. 2016-03-30 22:13:28 -04:00
ProperPants
065f3c8a9d Removed the tiles because apparently they're pointless. 2016-03-30 21:32:41 -04:00
Fox McCloud
d1765e0e14 Merge pull request #4019 from tigercat2000/disease1 
-tg- disease1
 2016-03-30 21:29:58 -04:00
ProperPants
bca3c683e2 Cyborg versions of stacks that didn't already have them. Increased cyborg starting rods to one full stack (60 rods). 2016-03-30 20:55:57 -04:00
TheDZD
cc6e89ace8 Merge pull request #4030 from Fox-McCloud/advanced-camera-port 
Ports Advanced Cameras
 2016-03-30 18:48:16 -04:00
Fox McCloud
ec9a7a486d Merge pull request #3927 from Crazylemon64/metal_foam_space_flooring 
Metal foam walls will now also produce plating on space tiles
 2016-03-30 16:26:56 -04:00
Fox McCloud
0f8085e1d8 Merge pull request #3980 from Aurorablade/ArtsAndCrafts 
Fethas Carnival of Horrors:Rusty Iron Chef
 2016-03-30 16:25:27 -04:00
ProperPants
15946be225 Operating tables can now be destroyed with a wrench. They give back as much plasteel as they cost to allow them to be moved. Trimmed dumb description for metal sheets. 2016-03-29 19:50:38 -04:00
Fox-McCloud
6648175a63 Ports Advanced Cameras 2016-03-29 06:05:59 -04:00
Crazylemon64
7aa519723b Merge branch 'master' of https://github.com/Crazylemon64/Paradise into metal_foam_space_flooring 2016-03-28 23:13:43 -07:00
Crazylemon64
00a39f5c83 Fixes stuff and stuff 2016-03-28 23:03:17 -07:00
Fox McCloud
65eab3d8c8 Merge pull request #4017 from ProperPants/WorkingBranch 
Additions to Engineering Cyborg and Maintenance Drones
 2016-03-29 00:17:23 -04:00
ProperPants
c1affcd02b Cyborg versions of some stuff. 
Added a line in some commentary that should have been there, but wasn't.
 2016-03-28 23:36:03 -04:00
ProperPants
cff2b62736 Deleted a blank line and some unused code that I came across. 
Tigercat2000 gave me permission.
 2016-03-28 22:51:27 -04:00
ProperPants
937a4c7479 Forgot something else 2016-03-28 22:42:12 -04:00
ProperPants
b5c073e58b Removes plasteel from drones and borgs. 2016-03-28 21:32:46 -04:00
ProperPants
f8f132d2f1 Should make robots unable to build anything out of plasteel and only plasteel. Here's hoping. 2016-03-28 17:06:38 -04:00
Tastyfish
08da2260a0 Ports tg's smooth progress bars 2016-03-28 04:24:26 -04:00
Tigercat2000
ad2cf86898 -tg- disease1 
Wee! Readds Disease1, kills off disease2, and finally removes poop.dmi
(fucking piece of shit)

Needs WAY more testing, most of which I don't know how to do yet, because
I've never used this system. Fun!

Changes:
 - Virus2 has been removed completely.
  - Some symptoms have not been readded. Aka, none of them have been
    readded, I just wanted to get this shit ported.
  - Virology has been updated slightly to mirror -tg-'s boxstation, as the
    virus2 machines are gone.
 - Welcome back, disease1
  - The centrifuge, vials, splicer, analyzer, growerthing, have all been
    replaced by the PanD.E.M.I.C. 2220
  - No symptoms have been completely removed; However, vision symptoms
    have been disabled pending byond 510, and genetics symptoms have been
    disabled until "when I figure out how to fix them".
  - Advanced Mutation Toxin now uses a disease, which turns people from
    species, to slime person, to slime. Slime people are instantly turned
    to a slime.
  - Diseased touch now give people appendicitis. Yes, they VANT YOUR...
    appendix.
  - Virology now has a fridge with the following in it:
    - Antiviral Syringes
    - 1 Rhinovirus culture
    - 1 Flu culture
    - 1 Bottle of Mutagen
    - 1 Bottle of Plasma
    - 1 Bottle of Synaptizine
  - A few more things, which I can't remember and can't look at while writing
    this commit. Sometimes, git hurts.

TODO:
 - Test more shit and figure out how the PanD.E.M.I.C. works/is supposed to
   work.
 - Fix genetics symptoms.
 - Give vampires a less shitty diseased touch.
 - Add appendicitis event.
 -
 2016-03-27 21:24:00 -07:00
Tastyfish
25195208a9 Ports tg simple_animal bots 2016-03-28 00:22:04 -04:00
ProperPants
f928b62492 Surprise commit. Fixed my borking of engi borg reduced cable coil. Removed plasteel from engi borg. Formatting fixes. 2016-03-27 23:23:38 -04:00
ProperPants
f79d33d47b This should add magboots and plasteel to maintenance drones. This should also add plasteel to engineers, and make synthetics capable of using plasteel. 2016-03-27 21:26:45 -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
Aurorablade
40a1086f14 butchering is still broke.... 2016-03-24 00:07:41 -04:00
Mieszko Jędrzejczak
3b514ddacb Things 2016-03-23 22:42:30 +01:00
Aurorablade
db887489d3 tiggersgonnaeatme 2016-03-23 17:31:29 -04: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
3bde57e65c Merge pull request #3905 from Aurorablade/GuardianUpdate 
Antagus Minor:Spritus
 2016-03-20 18:40:26 -04:00
Crazylemon64
fa14522a1f Makes a different, more fragile, floor type for the metal foams 2016-03-18 20:12:27 -07: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
09f06ff6fc Metal foam walls will now also produce plating on space tiles 2016-03-18 16:25:19 -07: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
723e150d28 Merge pull request #3896 from Fox-McCloud/heart 
Heart Tweaks
 2016-03-16 21:45:59 -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
2881d18903 Merge pull request #3892 from Tastyfish/crayon-ear 
Allows crayon to be put on ear
 2016-03-16 18:11:16 -04:00
Aurorablade
5896ebc1ca bwoink 2016-03-16 03:53:38 -04:00
Fox-McCloud
efe1871595 Addiction Rework 2016-03-15 18:36:29 -04:00