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

1625 Commits

Author SHA1 Message Date
Mieszko Jędrzejczak
03c173aeaf Lowers costs, adds darts to autolathe 2016-04-24 09:19:03 +02:00
Aurorablade
cb38f7b0f9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into Kungfu 2016-04-22 21:45:18 -04:00
Mieszko Jędrzejczak
5cf3f25892 Ports /tg/ Foam Force guns 2016-04-22 23:35:55 +02:00
Fox McCloud
7594206d16 Merge pull request #4261 from Tastyfish/vampfix 
Fixes devamping via the traitor panel
 2016-04-21 20:15:19 -04:00
Tastyfish
b798e7ef18 Fixes devamping in traitor panel 2016-04-21 19:58:49 -04:00
Aurorablade
991976fbcb before tiger kills me... 2016-04-19 17:30:13 -04:00
Fox-McCloud
87a9f30bd4 Part 6 2016-04-18 05:32:41 -04:00
Fox-McCloud
fe170db7bb part 3 2016-04-17 10:35:10 -04:00
Fox-McCloud
2453735d3f part 2 2016-04-17 00:21:31 -04:00
Aurorablade
2d85f582e1 martial arts shit 2016-04-16 22:22:21 -04:00
Fox-McCloud
f817351d2a part1 2016-04-16 10:40:21 -04:00
Fox McCloud
7700d224a3 Merge pull request #4202 from Crazylemon64/rubber_stamps_are_bureaucracy 
Adds granted and denied stamps to the bureaucracy crate
 2016-04-15 20:17:35 -04:00
TheDZD
5259dc6b1a Merge pull request #4138 from Fox-McCloud/door-sounds 
New Airlock Sounds
 2016-04-14 22:44:54 -04:00
TheDZD
eba294357a It's the bees 2016-04-14 20:30:30 -04:00
Crazylemon64
880056a87d Adds granted and denied stamps to the bureaucracy crate 2016-04-14 08:22:37 -07:00
TheDZD
b0fd688ed5 Merge pull request #4190 from Meisaka/fix-law 
Fix Malf Law in Law manager
 2016-04-13 16:24:57 -04:00
Meisaka Yukara
80b8aee935 Replace format code 2016-04-14 03:21:23 +09:00
Fox McCloud
dab1303d46 Merge pull request #4150 from Tastyfish/away-reorder 
Updates maploader code to be in line with tg's, startup improvements
 2016-04-11 19:41:22 -04:00
Tastyfish
a0ad6582a1 Updates maploader code to be in line with tg's, startup improvements 2016-04-10 02:57:58 -04:00
TheDZD
9ecf552708 Merge pull request #4127 from Fox-McCloud/traitor-vamp 
Traitor Vamp
 2016-04-09 22:17:15 -04:00
Tastyfish
20f8ca1095 Fixes meals prepared / food eaten scoreboard stats 2016-04-09 02:28:53 -04:00
Fox-McCloud
b315879c0d New Airlock Sounds 2016-04-08 05:44:49 -04:00
Fox-McCloud
6965d43aab tweaks 2016-04-07 23:45:03 -04:00
Fox-McCloud
4d58019d69 Traitor Vamp 2016-04-07 08:45:44 -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
TheDZD
62bfc02852 Merge pull request #4070 from Crazylemon64/virus-stealth-fix 
Fixes virus stealth to work as reported
 2016-04-04 18:59:46 -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
Crazylemon64
824019ff6c Makes it so that at 3 steath you are invisible to pandemic, instead of 4 2016-04-02 16:01:03 -07:00
Crazylemon64
a5045d0c33 Fixes virus stealth to work as reported 2016-04-02 15:42:55 -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
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
Aurorablade
1db93aae1f Iseeytou 2016-03-31 22:33:29 -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
Fox McCloud
d1765e0e14 Merge pull request #4019 from tigercat2000/disease1 
-tg- disease1
 2016-03-30 21:29:58 -04:00
Tigercat2000
ec3502af38 Fix the last of fox's noted bugs, runtime prevention 2016-03-30 18:12:03 -07:00
Tigercat2000
113c70a11b Fix Monkey-Transform disease 2016-03-30 10:55:17 -07:00
Aurorablade
a34efa3af8 fixes demons 2016-03-29 20:51:16 -04:00
Tigercat2000
61134f9ba4 Replace Synaptizine with Diphenhydramine, mineral for viro 2016-03-28 21:31:01 -07:00
TheDZD
69de9f1ced Merge pull request #4006 from FlattestGuitar/martial 
Fixes martial arts going away after boxing and booze
 2016-03-28 21:05:50 -04:00
Tigercat2000
2743d69198 Some reagent fixes. 2016-03-28 11:03:05 -07: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
Mieszko Jędrzejczak
c5ae1d1419 welp 2016-03-26 14:59:07 +01:00
Mieszko Jędrzejczak
ce5fe06cc5 Fixes martial arts going away after boxing and booze 2016-03-26 14:40:05 +01:00
TheDZD
5ed833053f Merge pull request #3976 from Fox-McCloud/sleeping-carp-fix 
Fixes Sleeping Carp Combos Attack Animations
 2016-03-24 16:46:47 -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
Fox-McCloud
334b2b967e Fixes Sleeping Carp Combos Attack Animations 2016-03-23 13:17:44 -04:00