phil235
79a20bd57b
slight fix
2015-03-09 19:19:17 +01:00
phil235
71d560bd3a
Fixes a runtime with buckling screen alert
...
Fixes being able to buckle to janicart while crit and when there's a dense object on the janicart's turf.
Fixes alien nest not buckling and being wrongly pixel shifted, and fixed a runtime.
Fixes golems being super easy to weaken by punch and not doing more damage themselves via punch.
Fixes some typos.
2015-03-09 19:09:52 +01:00
phil235
8a1a5ff832
Fixes Strangeness mutation gain text not appearing.
2015-03-09 16:49:31 +01:00
Remie Richards
d525fd6a87
Merge pull request #7872 from AnturK/hiss
...
Makes NPC queens/drones plant weeds/eggs
2015-03-09 14:27:55 +00:00
Cheridan
564238f335
Merge pull request #8215 from Ahammer18/Ahammer18
...
Slime Cake
2015-03-09 02:35:18 -05:00
Cheridan
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
Cheridan
e724a96dd2
Merge pull request #8202 from Mandurrrh/fixinlightfloors2
...
Fixes lightup floortiles icon state changing with merge.
2015-03-09 02:04:04 -05:00
Cheridan
fbab136950
Merge pull request #8016 from RemieRichards/EmbeddingBalance
...
Embedded Item Balancing. Also fixes #8029
2015-03-09 02:03:18 -05:00
Cheridan
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
Cheridan
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
Cheridan
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
Cheridan
237f5c366a
Merge pull request #8177 from MrStonedOne/patch-2
...
IsBanned() now rejects blank ckeys/ips/cids
2015-03-09 00:31:26 -05:00
Cheridan
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
Cheridan
f4734de342
Merge pull request #8162 from Jordie0608/thisdrillwillnotpiercetheheavensbecauseithasbroken
...
Fixes #8148 , Improves drill's handling of power
2015-03-08 23:41:50 -05:00
Cheridan
4dc830edc4
Merge pull request #8248 from Cheridan/master
...
Manual Merge of #7983
2015-03-08 23:30:17 -05:00
Cheridan
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
Cheridan
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
Cheridan
bb066ae1ce
Merge pull request #8210 from phil235/CoffeeOverdose
...
Changing Coffee jittering to be an overdose effect.
2015-03-08 22:18:32 -05:00
Cheridan
a2d7155761
Merge pull request #8185 from phil235/TurretMechFix
...
Porta turret fixes
2015-03-08 21:37:27 -05:00
Cheridan
2bb7e317e4
Merge pull request #8186 from phil235/ghostburgerfix
...
Fixes ghostburger and appendixburger icons.
2015-03-08 19:44:12 -05:00
Cheridan
662caa554f
Merge pull request #8205 from phil235/AlienDisposalFix
...
Fixes disposal climbing.
2015-03-08 19:41:08 -05:00
Cheridan
df0ba10a03
Merge pull request #8197 from Menshin/summon_guns_fix
...
Some fixes with Summon Guns
2015-03-08 18:13:32 -05:00
Ahammer18
0aa2246231
Fixed changelog and color
2015-03-08 13:52:26 -05:00
Cheridan
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
Ahammer18
cd1472bc42
Updated
2015-03-07 22:34:56 -06:00
Ahammer18
d295a401a1
A bit of a test I did, added slimecake.
2015-03-07 22:23:01 -06:00
Xhuis
9eddc94ccd
fixes args
2015-03-07 21:23:01 -05:00
Xhuis
71e2f745d4
Update paper.dm
2015-03-07 21:22:08 -05:00
Xhuis
7ac05bc3fd
Fixes ogresight + removes burntime var
2015-03-07 21:13:18 -05:00
Xhuis
b2d5c9c3c2
Allows paper burning
2015-03-07 20:59:14 -05:00
phil235
1d9106e6f0
Changing Coffee jittering to be an overdose effect.
2015-03-07 23:42:44 +01:00
Remie Richards
7488c47e7a
Merge pull request #8102 from Mandurrrh/tableclimbnerf
...
Balancing out tableclimbing.
2015-03-07 21:39:37 +00:00
Iamgoofball
42c3d0164e
Black powder hotfix
...
seriously merge this ASAP, fuck your 24 hour limit this needs fixed
2015-03-07 13:29:07 -08:00
phil235
00fdd0eded
Monkeys and xeno can flush disposal units.
2015-03-07 22:22:06 +01:00
phil235
588f1adb61
Make Airlocks with safety on no longer close on dense objects.
2015-03-07 21:06:33 +01:00
phil235
fdc0399a46
Ventcrawlers can now climb into disposal by themselves.
2015-03-07 20:03:25 +01:00
phil235
77d553e619
Fixes disposal climbing.
...
Aliens, slimes and monkeys can climb into disposal but cannot flush it.
Non carbon mobs can no longer climb into disposal by themselves.
Stuffing another mob in a disposal unit is now only done via grabbing.(fixes bugs like stuffing someone while being inside the disposal yourself)
Large mobs no longer fit inside disposal.
Fixes hydrotray growing overlay layer.
Fixes slicing broken pipes dropping a straight pipe.
Fixes typos.
Removing unused var from disposal.
2015-03-07 19:35:44 +01:00
Remie Richards
04dcfaddcf
Merge pull request #8135 from Miauw62/adminjumpfixes
...
Fixes adminjump being dumb.
2015-03-07 18:17:41 +00:00
Miauw
f84f6aafcd
Fixes adminjump being dumb.
2015-03-07 19:00:48 +01:00
Mandurrrh
3b24de7509
Fixes lightup floortiles icon state changing with merge.
2015-03-07 11:50:39 -05:00
Menshin
e20f36d639
* Fixes runtimes with Summon Guns.
...
* Fixes some summoned guns uncorrectly instanciating pins
2015-03-07 04:03:40 +01:00
Cheridan
95e269e211
Merge pull request #8122 from Xhuis/miners_messiah
...
Adds the ore satchel of holding
2015-03-06 15:15:40 -06:00
Incoming5643
febd47c6d6
byond inline spell checker fucking when
2015-03-06 15:20:56 -05:00
Cheridan
377dd9f876
Merge pull request #8142 from phil235/girderfixes
...
Fixes many checks in construction from stacks,
2015-03-06 13:54:09 -06:00
hornygranny
68c791ee7c
Merge pull request #7751 from RemieRichards/ProceduralGeneration
...
Procedural Map Generator System
2015-03-06 11:49:21 -08:00
hornygranny
d61cf2b022
Merge pull request #8107 from Cheridan/loot_ops
...
Nuke Op Loot Pinata Tweaks
2015-03-06 11:48:07 -08:00
Cheridan
0496dcd446
Merge pull request #8169 from dannno/morebarsigns
...
adds more barsigns
2015-03-06 13:35:13 -06:00
Cheridan
92a40fc470
Merge pull request #8126 from Iamgoofball/raginmages
...
fixes Ragin' Mages making only 1 mage
2015-03-06 13:04:48 -06:00
phil235
346007201b
Fixes vines not releasing mobs from their grip when destroyed.
2015-03-06 19:35:50 +01:00
Cheridan
d5ec11b91c
Merge pull request #8080 from Incoming5643/Appearance_fix
...
Tweaks and fixes for the appearance window
2015-03-06 12:20:24 -06:00
