8c9169f9a8
Merge pull request #10144 from phil235/StimulantsBuff
...
Buffs stimulants reagent.
2015-06-26 10:37:46 -05:00
90a6a8ca96
Revert "Revert "MERGE THIS RIGHT FUCKING NOW I DON'T CARE ABOUT TRAVIS""
2015-06-26 02:45:02 +03:00
97aaa5fb8d
Revert "Revert "Microbombs and Macrobombs, Nuke Ops start with Microbombs onc…"
2015-06-26 02:44:20 +03:00
69d6cd4f94
Revert "Microbombs and Macrobombs, Nuke Ops start with Microbombs once more"
2015-06-26 02:16:02 +03:00
a40697c545
Revert "MERGE THIS RIGHT FUCKING NOW I DON'T CARE ABOUT TRAVIS"
2015-06-26 02:12:29 +03:00
f45127b03c
MERGE THIS RIGHT FUCKING NOW I DON'T CARE ABOUT TRAVIS
...
how did I not notice this AAAAAAAAAAA
2015-06-25 15:28:57 -07:00
031a98d14c
Merge pull request #9836 from AnturK/viral
...
Makes viruses varedit friendly
2015-06-25 14:09:50 +02:00
454dc14b44
Merge pull request #10117 from Iamgoofball/explosive_implant
...
Microbombs and Macrobombs, Nuke Ops start with Microbombs once more
2015-06-25 12:49:03 +03:00
83629764d8
Buffs stimulants reagent. Changes the uplink stimpack description (immune to stuns -> nearly immune)
2015-06-25 00:55:11 +02:00
054f19d4b4
Merge pull request #9965 from phil235/HandTeleFix
...
Fixes handtele teleportation failing when the beacon is inside something.
2015-06-24 10:40:04 -05:00
4294a583b0
Microbombs and Macrobombs
2015-06-23 15:36:01 -07:00
64f4adb41e
Merge pull request #9510 from Cheridan/nuke_feedback
...
Nuke Op COMMUNITY FEEDBACK PR
2015-06-23 07:03:17 +01:00
e6b738734a
Merge pull request #8876 from xxalpha/fixfixfix
...
Cyber Implants + (Pt.2)
2015-06-21 22:12:17 +03:00
5d6f812474
Merge pull request #10024 from palpatine213/CorgiVirusFix
...
Fixes the corgi transformation virus
2015-06-21 10:39:02 -05:00
bc7d1ab93d
Changes the way the airlock charge works
2015-06-19 14:46:06 -04:00
2823a98244
Merge remote-tracking branch 'remotes/upstream/master' into thaw
2015-06-19 11:23:45 -04:00
e4281bbaab
Merge pull request #10019 from Thunder12345/autoshotgun
...
Moved combat shotguns to shotgun/automatic/combat
2015-06-19 17:06:00 +02:00
1dde070d18
Merge pull request #9800 from Dorsisdwarf/wittybranchname
...
Buffs nuke ops [merge ready]
2015-06-19 12:00:23 +02:00
e1356f889e
Merge remote-tracking branch 'remotes/upstream/master' into thaw
2015-06-18 23:37:06 -04:00
9f87f10077
Fixes a typo
2015-06-18 14:48:35 -07:00
1c83cc6d45
Pray pray pray
2015-06-18 18:07:57 +01:00
e6dcabf245
Merge pull request #9960 from xxalpha/bass
...
Put drop_item() calls inside ifs. Replaced some drop_item() with unEq…
2015-06-18 15:50:35 +02:00
e48d98323a
Fixes the corgi transformation virus
2015-06-18 01:58:37 -07:00
b0191fbb6d
White to black
2015-06-17 18:41:08 +02:00
bfb2345726
Moved combat shotguns to shotgun/automatic/combat
...
- shotgun/automatic/ will pump itself automatically on firing
- combat shotgun capacity nerfed to 6 rounds
- replaced all instances of the old path with the new one
2015-06-17 15:25:59 +01:00
3bc466a0ff
Merge remote-tracking branch 'remotes/upstream/master' into thaw
2015-06-16 11:42:47 -04:00
ae8c69f9a7
Merge pull request #9955 from kingofkosmos/spanspaceremoval
...
Unnecessary space removal from spans and messages
2015-06-15 18:20:04 +02:00
8fc003029c
Merge branch 'master' of https://github.com/tgstation/-tg-station into ironicthatonehumanisasectorzerolaw
...
Conflicts:
code/modules/mob/living/silicon/robot/robot.dm
2015-06-15 16:34:56 +10:00
ec8cd61d4c
Merge pull request #9808 from Incoming5643/march_of_the_snowflakes
...
WJohn's Hyper Customizable Lizard Sprites
2015-06-14 17:40:20 -05:00
cd3f4057a6
Fixes handtele teleportation failing when the beacon is inside something.
2015-06-15 00:39:36 +02:00
b2e84a0d3c
Put drop_item() calls inside ifs. Replaced some drop_item() with unEquip(
2015-06-14 20:11:40 +01:00
c8d79e7034
Removed unnecessary spaces in these situations:
...
"span class = '" changed to "span class='"
"'> " changed to "'>"
2015-06-14 12:13:19 +03:00
ec6c0465b5
Merge pull request #9879 from Incoming5643/skeleton_man
...
Magic Mania 1.91: Life's a lich and then you rework the mechanic to be less terrible
2015-06-13 04:24:38 +03:00
595bb0c8e4
Generalizes lizard parts to "features" for future non-lizard fields, at the same time merging mutant color into this list
...
Random lizard bodies will finally have color!
Pushes features almost all the way to the DNA side of thing, the mob side is only needed during character creation.
Note that changes to the save file will invoke a one time per character runtime for legacy characters as the save file purges mutant_color, this is as far as I can tell harmless, has no effect on the player, and is self correcting.
2015-06-12 00:43:35 -04:00
7363088cbc
Merge pull request #9802 from Miauw62/AyeEye
...
Nerfs the AI in several minor ways.
2015-06-11 14:13:52 -05:00
7afd81e083
removes loaded bag from locker, adds to uplink at discounted price. Lowers cost of least-used ammo type
2015-06-11 08:09:36 +01:00
6ffe546b74
Fixes an overwrite
2015-06-10 16:54:51 -04:00
5d62108a00
Oh my god I'm so tired and also I don't squash commits
2015-06-10 03:48:06 -04:00
1f0097a74a
Adds the bind soul spell for wizards. It turns them into a lich (skeleton) and gives them access to a long cooldown ressurection spell (starts at 3 minutes).
...
The ressurection spell can only be used while dead/dying and charges at all times. When used the lich gains a new body at the site of their phylactery and is stunned for a short while. Meanwhile the old wizard body crumbles to dust leaving all the wizards worldly possessions on the ground. Anyone who sees the corpse crumble will also get a cardinal direction pointing towards the wizard.
Every time the wizard dies this way, the time between ressurections is increased by a minute. To take a lich out of the game for good, either destroy the body before the lich can cast the spell again, or destory the phylactery and kill the wizard one last time.
Liches spawn with robes and spells intact, but nothing else, everything collected on their original body stays there.
As a balance issue, this spell can't be used in the den, the item must be bound after arriving at the station.
Adds a nice black wizard robe ensemble for liches.
Magic mirrors (save for a special badmin only one) can no longer skeletonize people.
Adds a hopeful mulligan fix to wizard rounds problems. Also corrects an adminlog message.
2015-06-10 03:40:14 -04:00
77d45e7017
Merge pull request #9824 from Incoming5643/all_my_old_shit_breaks_because_of_my_new_shit
...
Fixes show_game_type_odds
2015-06-09 16:07:33 -05:00
bff351c555
Intergrates lizard parts into dna stuff so changelings can properly steal them.
...
Turns all the lizard options into one associated list instead of their own vars, for tidiness
Shuffles horns behind frills in terms of layering
2015-06-07 21:05:34 -04:00
700c461422
FEATURE FOUR: Bulldog shotgun darts
2015-06-07 13:08:17 -04:00
db4b36e00a
Makes viruses varedit friendly
2015-06-07 17:09:32 +02:00
a4ffa349f6
Removes a repeated line on protecting assistants from traitor roles
...
look at me, I'm so confident I'm using the web interface
2015-06-07 00:13:01 -04:00
cbd1c9a788
Fixes show_game_type_odds
...
It had been accidentally gutted way back in #4215 so I've brought it back properly and better than ever.
2015-06-06 23:20:20 -04:00
0444bd82e4
FEATURE THREE: Airlock charges
2015-06-06 11:55:08 -04:00
3c59772025
Polishes the AI nerfs a bit:
...
* Removed camera wires.
* Tracking time is now dependant on distance to eye instead of core.
* AI detectors will light up when the AI tracks you.
Also added a changelog.
2015-06-06 16:51:09 +02:00
9cb1061bfb
Fixed hacking from inside machines and more.
2015-06-06 11:34:12 +01:00
fc88bce4b6
sets default shotgun ammo to slugs, makes syndicate ammo bag actually have ammo in it
2015-06-05 14:05:32 +01:00
ed8dffca94
Merge pull request #9721 from Jordie0608/callingspicyfoodwickeddoesntmakesensetome
...
Bugfix: Witticism depleted editon
2015-06-03 09:49:51 -05:00
Cheridan
Razharas
Iamgoofball
phil235
phil235
Remie Richards
Xhuis
Swag McYolosteinen
palpatine213
Thunder12345
AnturK
Jordie0608
xxalpha
kingofkosmos
Incoming
Dorsisdwarf
Incoming5643