ecb3a4e08f
Merge pull request #8236 from phil235/DoughChange
...
Dough change
2015-03-13 15:34:39 -05:00
e5428c1519
Merge pull request #8256 from phil235/StrangenessTextFix
...
Strangeness text, janicart, alien nest, weak golem fixes
2015-03-13 15:23:30 -05:00
2085f2d0d9
Merge pull request #8302 from phil235/DoorCrushMech
...
Door can now crush mech, dealing damage, just like with mobs.
2015-03-13 14:30:44 -05:00
77505c36af
Merge pull request #8300 from xxalpha/everyday
...
Fixes not being able to move from a single lattice.
2015-03-13 14:27:09 -05:00
3b89c07cd3
Merge pull request #8259 from phil235/BibleBookBagBug
...
Fixes book bags not being able to hold bibles and looking like backpacks
2015-03-13 12:51:10 -05:00
61d656a173
Merge pull request #8253 from Jordie0608/mergeconflictsihavenoideawhatyouretalkingabout
...
Unhardcodes brig timers
2015-03-12 21:30:26 -05:00
e8bd0de8c2
Merge pull request #8270 from Incoming5643/you_cannot_reblob
...
Keeps badmin blobs from trying to win with blob round blobs objectives.
2015-03-12 21:29:11 -05:00
28f6aae00c
Merge branch 'NinjaCleanup' of git://github.com/RemieRichards/-tg-station into RemieRichards-NinjaCleanup
...
Conflicts:
icons/mob/back.dmi
remie is a nerd btw
2015-03-12 20:47:11 -05:00
4768a84376
Door can now crush mech, dealing damage, just like with mobs.
2015-03-11 23:09:02 +01:00
9a116aea62
Fixes not being able to move from a single lattice.
2015-03-11 21:04:54 +00:00
5d5c21266c
Merge pull request #8262 from MMMiracles/usaneverdie
...
Liberation Station 3: Patriotic Tears
2015-03-11 00:26:33 +01:00
1eba7b694b
Merge pull request #8134 from Miauw62/ghostradios
...
Adds a toggle so ghosts can hear radio chatter more easily.
2015-03-10 23:56:28 +01:00
cb96e65f1b
Merge pull request #8254 from Steelpoint/HoSGunSpelling
...
[BALANCE]Buffs the Head of Security's Firearm.
2015-03-10 22:09:46 +01:00
c21c3046f3
Hamfistedly fixes #8266
2015-03-10 02:51:58 -04:00
866cadb1ea
The roundtype will be converted. If you feel that the round should not continue, end the round now.
...
The roundtype will be converted. If you feel that the round should not continue, end the round now.
The roundtype will be converted. If you feel that the round should not continue, end the round now.
2015-03-10 02:33:20 -04:00
72f465c864
Merge pull request #8138 from RemieRichards/BadminFuckingWithIcons
...
Clothing Icon File Admin Editing
2015-03-09 23:38:16 -05:00
1b1ee50b00
ASS BLAST USA USA USA USA
2015-03-09 17:50:37 -04:00
751fb4aaa9
Adds SLOT_BACK for energy katana, makes energy katana call emag_act() on what it strikes (mirroring energy/blade functionality cleanly), Removes energy/blade hacks.
2015-03-09 21:48:45 +00:00
f6e4c1518d
A restructure/removal/cleanup of Ninja Code
2015-03-09 20:43:56 +00:00
4f6c96235b
Fixes book bags not being able to hold bibles.
...
Changes the book bag sprite so it looks more like a briefcase and isn't confused with a backpack.
2015-03-09 21:13:01 +01:00
82b1b1adcd
Merge branch 'master' of https://github.com/tgstation/-tg-station into DoughChange
...
Conflicts:
icons/obj/food.dmi
2015-03-09 19:48:23 +01:00
79a20bd57b
slight fix
2015-03-09 19:19:17 +01:00
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
79857b0eac
InitalCommit
2015-03-09 17:02:34 +08:00
6f318417fe
unhardcodes brig timers
2015-03-09 19:28:22 +11: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
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
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
a2d7155761
Merge pull request #8185 from phil235/TurretMechFix
...
Porta turret fixes
2015-03-08 21:37:27 -05:00
662caa554f
Merge pull request #8205 from phil235/AlienDisposalFix
...
Fixes disposal climbing.
2015-03-08 19:41:08 -05:00
df0ba10a03
Merge pull request #8197 from Menshin/summon_guns_fix
...
Some fixes with Summon Guns
2015-03-08 18:13:32 -05: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
7488c47e7a
Merge pull request #8102 from Mandurrrh/tableclimbnerf
...
Balancing out tableclimbing.
2015-03-07 21:39:37 +00:00
588f1adb61
Make Airlocks with safety on no longer close on dense objects.
2015-03-07 21:06:33 +01:00
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
3b24de7509
Fixes lightup floortiles icon state changing with merge.
2015-03-07 11:50:39 -05:00
e20f36d639
* Fixes runtimes with Summon Guns.
...
* Fixes some summoned guns uncorrectly instanciating pins
2015-03-07 04:03:40 +01:00
95e269e211
Merge pull request #8122 from Xhuis/miners_messiah
...
Adds the ore satchel of holding
2015-03-06 15:15:40 -06:00
377dd9f876
Merge pull request #8142 from phil235/girderfixes
...
Fixes many checks in construction from stacks,
2015-03-06 13:54:09 -06:00
68c791ee7c
Merge pull request #7751 from RemieRichards/ProceduralGeneration
...
Procedural Map Generator System
2015-03-06 11:49:21 -08:00
d61cf2b022
Merge pull request #8107 from Cheridan/loot_ops
...
Nuke Op Loot Pinata Tweaks
2015-03-06 11:48:07 -08:00
0496dcd446
Merge pull request #8169 from dannno/morebarsigns
...
adds more barsigns
2015-03-06 13:35:13 -06:00
92a40fc470
Merge pull request #8126 from Iamgoofball/raginmages
...
fixes Ragin' Mages making only 1 mage
2015-03-06 13:04:48 -06:00
8130d16ddb
Fixes maintenance drone being targeted by the AI's porta turrets.
...
Fixes occupied mechs not being targeted by AI's porta turrets.
Simplifies target searching a bit.
Non AI Porta turrets with check_anomalies now also targets living/carbon/slime.
2015-03-06 19:00:50 +01:00
d56cb89407
Merge pull request #8076 from xxalpha/lighters
...
Grayscale Lighters
2015-03-06 00:00:51 -06:00
9cf4a0bfc6
Merge pull request #8114 from phil235/CookTrash
...
Cooking fixes for meat and trash
2015-03-05 23:54:29 -06:00
6b633c35d2
Merge pull request #8145 from Incoming5643/dangit_bobby_its_all_ones_and_zeros
...
Hotfix for Blob mulligan rounds not ending | Nuke codes being given in times of peace | AI desiring to blow up the station
2015-03-05 23:33:42 -06:00
Cheridan
phil235
xxalpha
phil235
Incoming
MMMiracles
Remie Richards
Steelpoint
Jordie0608
Cheridan
Mandurrrh
Menshin
hornygranny