Commit Graph

2293 Commits

Author SHA1 Message Date
Razharas
8fd2f74d2b Merge pull request #12223 from phil235/BugFixBoogalooB
Bug fix boogaloo, etc...
2015-10-10 03:24:38 +03:00
Razharas
9422258e84 Merge pull request #12181 from Xhuis/second_best_to_the_perma_fire_gimmick
Spell book rebalance
2015-10-10 03:15:53 +03:00
Razharas
28c9a70ace Fixes spell list clearing
Fixes spell list clearing
2015-10-10 02:55:51 +03:00
Razharas
32fd0da9f2 Merge branch 'patch-1' of https://github.com/whitefox08/-tg-station into whitefox08-patch-1 2015-10-10 02:38:43 +03:00
duncathan
996ef3503b adds current map to roundstart world.log 2015-10-07 22:01:43 -06:00
phil235
0efb30434a Fixes not being able to move during jaunting if you are cuffed and pulled.
Greenglow decal no longer disappears after 2 minutes.
Fixes runtime with explosive implant activation.
Fixes stunbaton infinite cell charge, the baton now turns off if you try using it after its cell has been deleted somehow.
Fixes bloody pulled mob leaving a blood trail in zero G.
Shortens the guardian battlecry message when attacking to lower chat spam.
Items in Morph now disperses a bit on death instead of being all on the same tile.
After reaching a limit of 50 items, morph swallowing items deletes them instead of putting them inside the morph.
Monkeys can no longer modify the hand labeller's text to communicate.
Fixes carbon,radium,uranium 's reaction_turf creating multiple decal on a tile, it now checks if there's already a decal of the relevant type and (for radium and uranium) only transfers reagent to it if it finds one.
2015-10-08 00:48:00 +02:00
Remie Richards
97de4b2ebe Merge branch 'master' of https://github.com/tgstation/-tg-station into HandOfGod-Resurgence
Conflicts:
	code/modules/mob/living/simple_animal/guardian/guardian.dm
	icons/mob/head.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/storage.dmi
2015-10-07 22:24:53 +01:00
Remie Richards
b9394257da About a million changes, but largely: Functional (Sort of) Antag Huds, Mind fixes, and Final glue to get the mode working. 2015-10-07 22:11:19 +01:00
Razharas
92523c03f2 Merge pull request #12137 from Xhuis/sleeping_carp_buff_2_please_dont_ban_me_from_the_repo
Sleeping Carp changes
2015-10-07 22:25:11 +03:00
Razharas
8b4447dcad Merge pull request #12157 from Xhuis/can_we_do_this_again
Generalizes vomit into a single carbon proc
2015-10-07 22:20:32 +03:00
Razharas
0ad7257a52 Merge pull request #12089 from MrStonedOne/maprotation
HOLY FUCKING SHIT, I'VE DONE IT! Map rotation!
2015-10-07 07:53:42 +03:00
Xhuis
527c7b568d Removes Cauterize 2015-10-06 20:17:43 -04:00
Razharas
156e0cabda Finishes Kors PR
Finishes Kors PR
2015-10-06 23:14:06 +03:00
Xhuis
7420f27c9b Conflicts 3/3 2015-10-06 11:24:36 -04:00
Xhuis
038a5ba891 Conflicts 2/3 2015-10-06 11:22:26 -04:00
Xhuis
276d6e5d68 Conflicts 1/3 2015-10-06 11:22:16 -04:00
Razharas
9b710d7fcb Merge pull request #12153 from duncathan/destroyfixes
Destroy() fixes
2015-10-06 09:27:41 +03:00
Razharas
070eb882db Merge pull request #12077 from GunHog/I_am_WJs_Code_Slave_Now
Royal Xeno Expansion!
2015-10-06 00:30:06 +03:00
Razharas
72af620748 Merge pull request #12135 from Xhuis/oh_god_my_eyes_are_bleeding
Virology symptom tweaks and a new symptom
2015-10-05 22:21:34 +03:00
Xhuis
7c226b9b1b Changes values on the Weakness symptom 2015-10-05 12:06:32 -04:00
Xhuis
832a3dcf90 Generalizes deflection to all martial arts 2015-10-05 12:01:31 -04:00
AnturK
ed8e252d00 Gamemode override for uplinks 2015-10-05 12:13:37 +02:00
Xhuis
25621e29fc VOMIT GENERALIZATION 2015-10-04 17:09:07 -04:00
Xhuis
908514c1b3 Some more changes 2015-10-04 12:52:55 -04:00
duncathan
1278b3e8ef fixes #11870; removes every last out of place del() call or definition 2015-10-04 08:03:04 -06:00
Xhuis
1211ec4102 Some gang stuff 2015-10-04 00:26:26 -04:00
Xhuis
a556db1ac5 Removes an errant bracket 2015-10-03 21:55:25 -04:00
Xhuis
a1dd42b3c3 Virology tweaks and a new symptom 2015-10-03 21:51:24 -04:00
Razharas
9fdedcfefc Merge pull request #12076 from Menshin/letsbeaheapstar
Some datastructures and A* tweaks
2015-10-03 18:15:23 +03:00
Menshin
e6b2f37182 * (Re)Made A* adjacent turfs checking proc generic
* Wrote a /reachableAdjacentAtmosTurfs proc that checks if a turf can be accessed via atmos
* Made airborne disease spreading only via atmos
* A* generic turfs checking proc can now take into account unsimulated turfs using an argument
* Fixes ling stings not working in space and floorbot not repairing hull breaches
2015-10-01 19:52:32 +02:00
Razharas
54d9e6924d Merge pull request #11868 from bgobandit/diditallforthelewdbe
Adds kitty mousey toys!
2015-10-01 05:06:34 +03:00
Razharas
447855dea6 Merge pull request #11989 from GunHog/PleaseGiveMeyourAIDS
DNA Restoration Virus Symptom
2015-09-30 23:01:59 +03:00
MrStonedOne
fcc8402f31 map rotation base code 2015-09-30 07:13:38 -07:00
GunHog
0a2be62d55 Royal Xeno Expansion
- Queens are now GIANT.
- Queens are now under the /royal type
- Added Praetorian caste.
- Buffed queen health to 400
- Royals now resist all but the strongest space winds
- Drones now must evolve into Praetorian before becoming queen.
- Queens without a Praetorian may now promote one.
- Royal Xenos now are not stunned by hulks or mechs.
- Hulks no longer push back royals, but still deal more damage.
2015-09-29 18:58:40 -05:00
Aranclanos
bc2febc021 Merge pull request #12029 from phil235/DeadDna
Fixes not being able to save the dna of corpses in the dna console.
2015-09-28 06:36:05 -03:00
Aranclanos
3cd16768cf Merge pull request #11976 from Iamgoofball/patch-124
Replaces Nutriment with Salt in Virology cures
2015-09-27 17:42:28 -03:00
Remie Richards
131b69474e Merge branch 'master' of https://github.com/tgstation/-tg-station into HandOfGod-Resurgence
Conflicts:
	code/__HELPERS/unsorted.dm
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/modules/client/preferences.dm
	icons/mob/feet.dmi
	icons/mob/head.dmi
	icons/mob/inhands/items_lefthand.dmi
	icons/mob/inhands/items_righthand.dmi
	icons/mob/mob.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/shoes.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/items.dmi
	icons/obj/projectiles.dmi
2015-09-27 17:15:01 +01:00
Remie Richards
58483beb50 Hand of god gamemode!
be_special and antag defines are no longer limited to 16 values (1 - 32768) by being changed from a bitfield to a list, an appropriate block of code exists to automatically update bitfield versions to the new list format. the list format allows us to have (functionally) infinite antag types.
2015-09-27 16:49:56 +01:00
KorPhaeron
804d6f5d7a Icon 2015-09-26 12:35:04 -05:00
KorPhaeron
3c2e3af34e Redo 2015-09-26 12:07:45 -05:00
phil235
9293cdddb8 Fixes not being able to save the dna of corpses in the dna console.
Corpses can now have their dna changed (but they don't acquire mutations). You can use a dna injector on them and modify their dna with the dna console.
2015-09-26 18:04:35 +02:00
GunHog
3b5e96ccb9 Changes cloneloss heal to brainloss 2015-09-25 12:51:45 -05:00
Razharas
b9b8734b74 Merge pull request #11966 from MMMiracles/dwarfsman
Dwarfism
2015-09-25 12:18:52 +03:00
KorPhaeron
bbd2b1883c Tail sweep 2015-09-24 23:49:47 -05:00
GunHog
f6016c0754 DNA Restoration Virus
Adds a new virus symptom: DNA Restoration.
- Heals cloneloss damage.
- Reduces radiation (but not toxin damage)
- Cleanse the SE of unwanted mutations, but ignores powers.
2015-09-24 15:45:15 -05:00
Iamgoofball
93c0dbf8ff Replaces Nutriment with Salt in Virology cures
suggestion from forum thread on making virology less painful and dumb

doesnt fix the rng but i guess this is better?
2015-09-23 20:46:44 -07:00
Razharas
4a99082cf6 Merge pull request #11888 from KorPhaeron/toolboxcrusaders
Guardian Changes
2015-09-24 01:46:59 +03:00
MMMiracles
59cd06a282 .05 too short 2015-09-23 18:40:37 -04:00
MMMiracles
3d43b8e389 dwarfdwarfdwarf 2015-09-23 18:13:16 -04:00
Razharas
e4cb3cd6b0 Merge pull request #11941 from KorPhaeron/funremovalmk2
Removes DNA Aide
2015-09-23 20:24:00 +03:00