cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-21 07:42:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,527 Commits 26 Branches 2 Tags
288af9f92cb15d93b0956a8b32b2f47ebb0dfd93
Commit Graph

6813 Commits

Author SHA1 Message Date
Fox-McCloud
b3b0abd95b Fixes Weakeyes 2016-04-03 01:19:49 -04:00
Tigercat2000
94ff8fc4ef whoops forgot to remove this 2016-04-02 21:32:11 -07:00
Tigercat2000
b4eaf130b0 Merge remote-tracking branch 'upstream/master' into tgport-16569 
Conflicts:
	.gitignore
 2016-04-02 20:29:28 -07: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
8e7c447646 Ports tgstation/-tg-station#16569, World Topic() changes 
Full changes:
 - World Topic() is now standardized to use if("parameter" in topic_list)
   instead of an amalgamation of findtext() and if(topic == "parameter").
 - Comms password is now verified at the top of world/Topic() and sets a
   variable to true if it is present and correct.
 - "status" now returns extra information if the comms_password is
   provided and correct.

Misc changes:
 - Shuttle text has been standardized as a proc on mobile docking ports.
   This is used by status/supply displays and mob/Stat() for the -ETA- etc stuff.
 2016-04-02 17:38:49 -07:00
Fox McCloud
a42bcb53e3 Merge pull request #4061 from Aurorablade/AntagHudUpdates 
Antag Hud updates
 2016-04-02 04:13:20 -04:00
Tigercat2000
7a41efd1da Last staging fixes 2016-04-01 16:09:43 -07:00
Tigercat2000
a36ec06fc2 First 510 merge fixes 2016-04-01 14:20:17 -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
TheDZD
54ed72ffd4 Merge pull request #4052 from Fox-McCloud/simple-animal-eating 
Refactor of Simple Animal Eating
 2016-04-01 15:43:16 -04:00
Fox-McCloud
e277cf292b Headcrab Fix 2016-04-01 01:11:11 -04:00
Fox-McCloud
5d8b02b37a cleanup 2016-04-01 00:39:48 -04:00
Aurorablade
1db93aae1f Iseeytou 2016-03-31 22:33:29 -04: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
f91b5ee332 Never make commits literally five minutes after waking up. 2016-03-31 08:31:35 -04:00
ProperPants
bd4230f469 Cyborg wood was being used by drones. No longer. 2016-03-31 08:25:03 -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
Fox-McCloud
24139b8a84 Refactor of Simple Animal Eating 2016-03-31 07:15:46 -04:00
Fox McCloud
68dd38c10d Merge pull request #4040 from Tastyfish/paichat 
Adds chatroom to PAIs
 2016-03-31 04:15:58 -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
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
Tastyfish
fb9c883b90 Makes medibots ignore IPC's 2016-03-30 17:55:31 -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
Tastyfish
80c0f0ee1f Make pai chatroom cost 5 2016-03-30 11:43:23 -04:00
Tastyfish
653e6738b8 Removes pAI insertion from named secbots 2016-03-29 21:53:56 -04:00
Tastyfish
9826985f3f Adds chatroom to PAIs 2016-03-29 21:44:29 -04:00
TheDZD
4e5dca681b Merge pull request #4024 from Tastyfish/clickyclick 
Makes clicking a filled inventory slot's square be treated like clicking the item
 2016-03-29 17:14:39 -04:00
Fox-McCloud
6648175a63 Ports Advanced Cameras 2016-03-29 06:05:59 -04: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
TheDZD
5c800cec04 Merge pull request #4010 from Fox-McCloud/lusty-xeno-maid 
Ports Lusty Xenomorph Maid
 2016-03-28 22:45:41 -04:00
ProperPants
937a4c7479 Forgot something else 2016-03-28 22:42:12 -04:00
Fox-McCloud
6b5e1904f5 tweaks 2016-03-28 22:28:19 -04:00
ProperPants
b5c073e58b Removes plasteel from drones and borgs. 2016-03-28 21:32:46 -04:00
TheDZD
afcdb0c40a Merge pull request #4011 from Fox-McCloud/xeno-brain-fix 
Xeno Brain Fixes
 2016-03-28 17:45:49 -04:00
ProperPants
0d9fc37065 Forgot a comma. 2016-03-28 17:16:31 -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
Fox McCloud
77fe56d9b9 Merge pull request #4023 from Tastyfish/progress 
Ports tg's smooth progress bars
 2016-03-28 16:55:37 -04:00
Tastyfish
53728f95fe Clicking a filled inventory slot's background is now treated like clicking the item. 2016-03-28 05:24:00 -04:00
Tastyfish
d37f077e2c Ports tg smooth progress bars 2016-03-28 04:40:36 -04:00
Tastyfish
08da2260a0 Ports tg's smooth progress bars 2016-03-28 04:24:26 -04:00
Tastyfish
24679ae276 Makes Poly use the say/radio prefix system correctly 2016-03-28 03:29:23 -04:00
Tastyfish
4ba5a6eefd Moves MULEbot Runover code to mulebot/Move() 2016-03-28 01:58:06 -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