Commit Graph

271 Commits

Author SHA1 Message Date
phil235
235f92623b Description now meantions all mutations that the vine has. 2015-01-03 00:15:06 +01:00
phil235
840d2e87bd Makes mutated vines description be explicit about the type and special function of the vines. "These are oxygen consuming vines." 2015-01-02 23:35:25 +01:00
Razharas
76a21883a8 Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit
Conflicts:
	code/game/mecha/mecha.dm
	code/game/objects/structures/tables_racks.dm
	code/modules/mob/living/silicon/silicon.dm
	code/modules/projectiles/gun.dm

Fixes dem conflicts
2014-12-28 11:20:15 +03:00
tkdrg
cc474b2af6 Merge pull request #6591 from phil235/FingerlessSpriteFix
Fix fingerless gloves icon and washing machine changing boxing gloves
2014-12-27 15:46:43 -03:00
Cheridan
71385308de Merge pull request #6387 from Incoming5643/goodbye_my_children
Magic Mania 1.8: Summon Spells Rework and The Challenge System
2014-12-26 16:29:36 -06:00
phil235
b6e35278e3 Fixes cutting black gloves to make fingerless gloves not changing the icon to fingerless.
Fixes the washing machine being able to change boxing gloves, ninja gloves and botany gloves to look like simple colored gloves. Creating a /gloves/color category for all gloves whose color can be changed.
Fixing some absolute pathing.
2014-12-26 17:04:09 +01:00
Cheridan
068adcb4da Merge pull request #6545 from tkdrg/runtimes-killed-santa
Fixes christmas event runtime
2014-12-25 16:20:45 -06:00
tkdrg
26105e7ee1 Fixes christmas event runtime 2014-12-24 13:21:58 -03:00
Razharas
1b45752b05 Fixed conflicts
Ye again and again and again and again
Do it again, do it again~
2014-12-23 05:39:39 +03:00
paprka
2371e2ebd8 renames chef to cook 2014-12-22 17:02:06 -08:00
MrPerson
c002d11ee7 Merge pull request #6476 from Cheridan/nightcrawler
Refactors snowflake AI hosting in ninja
2014-12-21 17:02:48 -08:00
Razharas
9a27fe7c8d Conflict fix
Yeah makes it all work
2014-12-21 06:12:33 +03:00
Cheridan
fdab1d7294 REMOVES THE BLACKS 2014-12-18 21:16:29 -06:00
Cheridan
25cc2999b0 Refactors snowflake AI hosting in ninja
why did i volunteer for this

It just has an integrated intellicard now. The gloves do the transferring.
Also Intellicards are all called Intellicards now and not Intelicards.

the ai_transfer proc is less awful but it's still
awful
awful awful awful
2014-12-18 21:03:09 -06:00
MrPerson
81591498ca Removes a bunch of commented out code from ninja.dm 2014-12-18 07:29:16 -08:00
Razharas
f0c8f2eeac Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit
Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm

conflicts resolution
2014-12-16 02:52:08 +03:00
Incoming
0dd71178c4 Magic Mania 1.8: Summon Spells Rework and The Challenge System
Summon Guns and Summon Magic are no longer traditional spells.

When cast by the wizard, he gains a charge for his spell book but no antagonists are created, essentially making his life harder for more power. Both spells can only be cast once like this for a maximum of 2 extra charges.

When cast by very rare chance in summon events, no charages are gained, and there's a 10% chance of someone becoming a survivor, down from 25%. No charges are gained if this happens.

When cast by a badmin they will be given a choice of not creating antags, creating antags at the old chance, or just going in stupid and giving everyone antag.
2014-12-14 22:07:00 -05:00
Razharas
0921aa201f Added datum mutations
Also removed some mob vars like sdisabilities and merged the usability
with disabilities
Removed need for mutations var, they are not handled in dna
Removed blinded var, now its handled by eye_blind being bigger than zero
Ands lots, lots of other shit in files that used mutations
2014-12-12 04:48:11 +03:00
Miauw
d895354111 Covers up traces of the coder conspiracy. 2014-12-08 17:06:27 +01:00
Miauw
12279d9c8e Adds a santa event where a dead player is spawned as Santa! HO HO HO!
Also adds a few more things to the random gifts.
2014-12-08 17:03:52 +01:00
Razharas
7758a0afed Ok now explosions shall work properly
Changed severity to target, make items not destroy themselves on
severity lower than 1, all that stuff
2014-12-05 23:21:48 +03:00
Razharas
c5209f2399 Merge branch 'master' of https://github.com/tgstation/-tg-station into Cfour 2014-11-27 15:30:37 +03:00
Razharas
4998b19ddf Merge pull request #5679 from Aranclanos/projectilesBump
Projectiles bump fix, spawn() removal
2014-11-27 03:38:05 +03:00
hornygranny
21b8df82d5 Merge pull request #5908 from tkdrg/hud
Makes data and antag huds passive and creates /datum/atom_hud
2014-11-25 12:53:03 -08:00
Razharas
84e69cff6b Conflict resolve
Damn cables
2014-11-24 12:27:53 +03:00
Razharas
343e2ca1f5 Simple fix for brand intellegense runtime
Should fix #5672
2014-11-22 20:09:19 +03:00
Razharas
ff456ebaf4 Unwinded most of shit
Meh
2014-11-19 21:36:45 +03:00
Remie Richards
2138e1d2c7 Merge pull request #5884 from tkdrg/ionblastUSA
Moves the ion law picklists to an external txt
2014-11-17 09:48:04 +00:00
tkdrg
705a264dcf Makes data huds passive. 2014-11-16 01:52:06 -03:00
Cheridan
24456bcc22 Merge branch 'PipenetRevamp' of https://github.com/Aranclanos/-tg-station into Aranclanos-PipenetRevamp
Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm
	code/ATMOSPHERICS/atmospherics.dm
	code/ATMOSPHERICS/components/portables_connector.dm
2014-11-13 18:55:53 -06:00
Cheridan
38eeca2ebd Merge pull request #5644 from Jordie0608/beekeepermodewhen
Adds bee swarms and butterflies and diseases to create them
2014-11-13 17:04:29 -06:00
tkdrg
47efa898df Ion strings moved to external txt. Credits to volundr @ goonstation for the idea and the contents of _string_lists.dm 2014-11-13 19:59:20 -03:00
hornygranny
e392609b6f Merge pull request #5425 from Menshin/meteor_redux
Meteors redux
2014-11-08 15:24:44 -08:00
Menshin
c724b54892 * Fixes meteors infinigibs and infinisplosions (#5226)
* Made meteors more threatening
* Added an ultra rare station buster Tunguska meteor
* Made admin-spawned meteor not instantly delete
* Added several types of meteor waves : normal, threatening, catastrophic which are randomly choose at wave start
* Meaty ores now spawn blood on tiles instead of busting them
* Differentiates regulars and reinforced girders ex_act
* Changelog included
2014-11-08 14:43:48 +01:00
Jordie0608
590684e129 Merge branch 'master' of https://github.com/tgstation/-tg-station into beekeepermodewhen
Conflicts:
	icons/mob/animal.dmi
	tgstation.dme
2014-11-09 00:15:12 +11:00
Remie Richards
2054cbda08 Merge branch 'master' of https://github.com/tgstation/-tg-station into DiseaseRework
Conflicts:
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/human/human_attackpaw.dm
	code/modules/mob/living/carbon/monkey/monkey.dm
2014-11-08 01:07:29 +00:00
phil235
bc5754b378 adding diagonal attack animation. 2014-11-07 15:42:07 +01:00
Aranclanos
364f4e1f24 Changes the call from process() to fire() in all places where a projectile is created. 2014-11-04 16:38:58 -03:00
phil235
1506383b2c Adding some missing do_attack_animation()
Moving do_attack_animation() proc to mob/living
Fixing the pixel offset issue from beds especially rollerbed.
Fixing the nograv bouncing stopping because of another animation being used.(lying down, jittering, attack animation)
2014-11-03 15:11:39 +01:00
Aranclanos
5a237e6854 Merge branch 'master' of https://github.com/tgstation/-tg-station into PipenetRevamp 2014-11-03 08:34:47 -03:00
Aranclanos
8aa5a137c5 Pipenet revamp
-Removed the pipenet network datum, now it will all be done with the pipeline datum
-All atmos pipes and machines will always have a pipeline datum
-Moved the valves to the binary subtype and the portable connectors to the unary subtype
-The pipe vents (who were barely used in three spots of the map) are removed, the map slots will replaced with outlets
-Fixes some bugs of pipenet disconnection, mostly on explosions
-Cleaned a bit the copypaste of construction.dm of pipes
-Removed the ID restrictions of digital valves and the frequency (both unused)
2014-11-03 08:21:31 -03:00
phil235
3f30912c51 WIP - Adding attack animation to most attacks.
Fixing a couple "for(......) show_message()".
2014-11-02 22:50:58 +01:00
Menshin
5037e880d8 Fix the lag produces by oversized Pumpkings bounds interacting with space transitions.
Reduced the number of meteors to 10 waves of 3 over 40 seconds.
2014-10-31 19:48:55 +01:00
Miauw
0cadefd855 Nothing to see here, continue with your planned spooking, citizens. 2014-10-31 21:52:10 +01:00
tkdrg
0bb462e857 Fixes botcall conflicts, removes even more cruft and unused code 2014-10-30 20:36:30 -03:00
Remie Richards
fa184f5487 Cuts /disease variables from 28 to 23 (includes new ones)
a disease may now have more than one spread type
added "infectivity" variable which replaces a prob(65), defaults to 65
affected_species is now viable_mobtypes, and lists typepaths, this is due to us actually having a species system now so it's confusing
adds defines for a bunch of stuff
2014-10-30 06:21:14 +00:00
Miauw62
9a378933d2 Makes spookoween compile 2014-10-25 11:40:53 +00:00
Miauw62
a0d3a09ef8 Merge branch 'master' of https://github.com/tgstation/-tg-station into thespookisreal
Conflicts:
	code/modules/events/carp_migration.dm
2014-10-25 11:29:07 +00:00
phil235
a4d707f00f Also fixing the end() proc for pyroplastic anomaly. 2014-10-22 21:00:38 +02:00
phil235
e73abf676f Merge branch 'master' of https://github.com/tgstation/-tg-station into AnomalyFix 2014-10-22 20:54:35 +02:00