564238f335
Merge pull request #8215 from Ahammer18/Ahammer18
...
Slime Cake
2015-03-09 02:35:18 -05:00
b2d6abebb3
Merge pull request #8100 from Incoming5643/newbieguard
...
Adds a free pass to assistant for player accounts younger than two weeks
2015-03-09 02:29:09 -05:00
e724a96dd2
Merge pull request #8202 from Mandurrrh/fixinlightfloors2
...
Fixes lightup floortiles icon state changing with merge.
2015-03-09 02:04:04 -05:00
fbab136950
Merge pull request #8016 from RemieRichards/EmbeddingBalance
...
Embedded Item Balancing. Also fixes #8029
2015-03-09 02:03:18 -05:00
e846a6eeb4
Merge branch 'TheAnimalsTheyAttack!' of git://github.com/Sometinyprick/-tg-station into Sometinyprick-TheAnimalsTheyAttack!
...
Conflicts:
code/game/gamemodes/wizard/spellbook.dm
icons/mob/mask.dmi
2015-03-09 01:47:40 -05:00
5a6bacf139
Merge pull request #8073 from Xhuis/burn_this_message_after_you_read_it
...
Adds paper burning
2015-03-09 01:09:41 -05:00
7b6532ca79
Merge pull request #7984 from Incoming5643/farewell_to_shitty_slimes
...
Reworks the pink/light pink slime line to not be nearly worthless to breed
2015-03-09 01:03:21 -05:00
237f5c366a
Merge pull request #8177 from MrStonedOne/patch-2
...
IsBanned() now rejects blank ckeys/ips/cids
2015-03-09 00:31:26 -05:00
0015d4c120
Merge pull request #8141 from Incoming5643/Subjectivity_is_a_bitch
...
Skipping mulligan antag based on Time/Subjectivity from admins + tweaks
2015-03-09 00:14:28 -05:00
f4734de342
Merge pull request #8162 from Jordie0608/thisdrillwillnotpiercetheheavensbecauseithasbroken
...
Fixes #8148 , Improves drill's handling of power
2015-03-08 23:41:50 -05:00
4dc830edc4
Merge pull request #8248 from Cheridan/master
...
Manual Merge of #7983
2015-03-08 23:30:17 -05:00
7ec6ad84cd
Merge branch 'renamingandreskinning' of git://github.com/paprka/-tg-station into paprka-renamingandreskinning
...
Conflicts:
icons/mob/back.dmi
2015-03-08 23:15:22 -05:00
855cf7c6b5
Fixes morphine to actually knock you out.
2015-03-08 20:50:09 -07:00
7058125d0e
Merge pull request #8207 from phil235/AirlockDensityObstacleFix
...
Make Airlocks with safety on no longer close on dense objects.
2015-03-08 22:47:17 -05:00
bb066ae1ce
Merge pull request #8210 from phil235/CoffeeOverdose
...
Changing Coffee jittering to be an overdose effect.
2015-03-08 22:18:32 -05:00
e5a3694c0f
Adds Napalm as a reagent and merges old napalm into Phlog. Fixes some foam stuff.
2015-03-08 19:43:17 -07:00
a2d7155761
Merge pull request #8185 from phil235/TurretMechFix
...
Porta turret fixes
2015-03-08 21:37:27 -05:00
c9cc003c65
Explicitly passes a mobs mutant_color in blood samples
2015-03-08 20:55:36 -04:00
2bb7e317e4
Merge pull request #8186 from phil235/ghostburgerfix
...
Fixes ghostburger and appendixburger icons.
2015-03-08 19:44:12 -05:00
662caa554f
Merge pull request #8205 from phil235/AlienDisposalFix
...
Fixes disposal climbing.
2015-03-08 19:41:08 -05:00
4338a3f4ca
forgot to make krok work right
2015-03-08 17:15:06 -07:00
8dfcbd8b24
Changes smoke back to TOUCH reaction.
2015-03-08 17:04:45 -07:00
2cee886f04
whoops and shit
2015-03-08 17:02:38 -07:00
573aea927b
Removes newcrit, fixes, changes, old chems now process every tick as per usual, only goonchems process every 3 ticks now.
2015-03-08 16:43:57 -07:00
df0ba10a03
Merge pull request #8197 from Menshin/summon_guns_fix
...
Some fixes with Summon Guns
2015-03-08 18:13:32 -05:00
193372b407
Loyalty Implant Firing Pins
...
- Allows the construction of Loyalty Pins at Combat tech 5, instead of
10.
2015-03-08 16:46:41 -05:00
b7aee533b5
Readd the last_tick var and buff mutetoxin effect to solve the issue with 'silent' in a simpler way.
2015-03-08 22:44:47 +01:00
e6f257d413
Merge branch 'master' of https://github.com/tgstation/-tg-station into explosive
...
Conflicts:
code/modules/mob/living/carbon/carbon.dm
code/modules/mob/living/carbon/carbon_defines.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/reagents/Chemistry-Goon-420BlazeIt.dm
code/modules/reagents/Chemistry-Goon-Pyrotechnics.dm
2015-03-08 14:26:52 -07:00
1a092e0ede
Changes how doughs are made. 10water+15flour chem reaction for dough. 15flour+15eggyolk+5sugar for cake batter (or alternatively for vegans 15 soymilk instead of the eggyolk).
...
Introduce egg yolk reagent
You can break eggs in open reagent containers or blend them to get egg yolk.
Fixes breadslices sprites and other merge conflict bugs in food.dmi.
Change customizable snack max volume to 60. Buff nutriment amount in doughs.
2015-03-08 22:15:55 +01:00
dd2fe28678
Fixes cavity implant surgery not respecting NODROP
2015-03-08 16:35:46 -04:00
fc81daee07
Added Thermals and emp_act(). Tweaked some related code.
2015-03-08 20:19:02 +00:00
f602408aef
Update Chemistry-Goon-Medicine.dm
2015-03-08 13:12:29 -07:00
0aa2246231
Fixed changelog and color
2015-03-08 13:52:26 -05:00
61e1abafc6
Meth no longer breaks the space time continuum.
2015-03-08 10:45:25 -07:00
8b14886c51
Cyborgs no longer have flesh to knit.
2015-03-08 10:44:43 -07:00
b1e340b19b
Added X-ray implant, implant icon, touched up surgery.
2015-03-08 17:25:05 +00:00
3796f32394
fixed improper req_tech "power" -> "powerstorage" in several research designs
2015-03-08 18:23:34 +01:00
93c982ea5c
Fixes hulks not losing their mutation when low on health.
...
Fixes carbon mobs resistant to paralysis not going unconscious when in crit.
2015-03-08 16:38:44 +01:00
282d0231e0
WIP moving carbon/life to living/life()
2015-03-08 16:22:41 +01:00
b669f363d3
Fixes mimana not dropping mimanapeel when eaten.
...
Fixes typo in oat stalks
Fixes Reagent metabolization only calling the reagents on_mob_life procs once every two life().
Moving dizziness, drowsiness and jitteriness natural decreases all inside carbon/handle_regular_status_updates()
Drowzyness now drops faster when resting.
Slight adjustment to mutetoxin effect on mob.
2015-03-08 13:53:23 +01:00
9384d44ee5
Adds a magic mirror to the wizards shuttle. The magic mirror has greatly expanded functionality compared to the normal one, and can additionally change a wizards name, gender, race, hair color and eye color.
...
Additionally this fixes up some rogue simulated airless tiles on the wizards shuttle (these tiles were why the creature would always end up dead)
2015-03-08 04:24:04 -04:00
79d05ad5c6
Merge pull request #8188 from phil235/VineGripFix
...
Fixes vines not releasing mobs from their grip when destroyed.
2015-03-08 01:08:16 -06:00
cd1472bc42
Updated
2015-03-07 22:34:56 -06:00
d295a401a1
A bit of a test I did, added slimecake.
2015-03-07 22:23:01 -06:00
9eddc94ccd
fixes args
2015-03-07 21:23:01 -05:00
71e2f745d4
Update paper.dm
2015-03-07 21:22:08 -05:00
7ac05bc3fd
Fixes ogresight + removes burntime var
2015-03-07 21:13:18 -05:00
b2d5c9c3c2
Allows paper burning
2015-03-07 20:59:14 -05:00
768a6f7305
Update Blob-Reagents.dm
2015-03-07 15:35:53 -08:00
1d9106e6f0
Changing Coffee jittering to be an overdose effect.
2015-03-07 23:42:44 +01:00
Cheridan
Cheridan
Iamgoofball
Incoming
GunHog
phil235
xxalpha
Ahammer18
norill
Xhuis