7c305305b7
Fix reagent garbage collection hopefully
...
I say hopefully because stuff that collects successfully locally likes to fail on sybil.
2015-03-14 16:52:49 -07:00
0232afd05d
Fix typo in catalyst.
...
Fix flamethrower crafting recipe (now only use 1 rod, calls checkparts() to set up the weldingtool and igniter).
Fix lack of message when trying to turn on an unsecured welding tool.
Fix lack of icon update when clicking plasma tank with empty flamethrower.
2015-03-15 00:23:47 +01:00
456a64f8fd
slime from carbon to simple animal
2015-03-14 23:40:57 +01:00
52dfa42eb5
Merge pull request #8257 from phil235/ReflectFix
...
Simplifies laser reflection code
2015-03-14 16:15:52 -05:00
f552aa0ce1
Merge pull request #8222 from Incoming5643/I_dont_even_know_who_I_am_anymore
...
Magic Mania 1.855: Appearances are everything
2015-03-13 23:01:34 -05:00
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
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
9038fb15af
Code cleanup
...
Removed a bunch of unused or hardly used vars on /mob and /atom/movable.
Added defines for mob/living/var/mob_size so it's not using magic numbers.
2015-03-13 10:41:00 -07:00
fb099a64e7
Adds a cyborg upgrade module for the satchel of holding. Also fixes the diamond drill upgrade for borgs not being able to equip the drill with upgrade.
2015-03-12 23:26:02 -04: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
93425742e5
bop
2015-03-12 20:00:10 -04:00
8092764332
Adds the ability to spike bears on the meatspike for their pelt, as well as yield 5 meat instead of 3. Less messy, more efficient.
2015-03-12 19:50:23 -04:00
29609457f5
Makes the message when you're attacked slightly bigger for better visibility."
...
Changes two "for... show_message()" into "visible_message()".
2015-03-12 23:15:54 +01:00
16a0d7bf80
Fix for flamethrower deconstruction.
2015-03-12 19:58:37 +01:00
b7f878d047
gun cases
2015-03-11 21:30:07 -04:00
3bf0c7015a
Replace some object verbs with alt-clicking
2015-03-10 21:28:13 -04: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
7ba8af5222
Fixes steel cap bug. Steel cap now growns steel logs similar to wooden logs, you use the hatchet to get rods.
...
Reorganizes all flashing to use the same mob proc 'flash_eyes()' (welding tool use, flashbang, flashers, laserpointers, etc).
Fixes making sandstone not stacking the result sandstones on the floor.
Sandstone, grass tile and carpet tile now look for other incomplete stack on their creation location to try to put them all in one stack (exactly like wood planks).
Fix typos.
Remove banglet var from all flashbangs, making flashbangs from clusters behave exactly like the other ones.
Renames eyecheck()proc to check_eye_prot() and moves it to mob/living level, elso creates check_ear_prot() for checking ear protection.
2015-03-10 20:30:46 +01: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
5e1c69a76a
Removes unnecessary stuff
2015-03-09 16:48:41 -04:00
00e352cee2
Restores gibbing for suiciding with C4
2015-03-09 16:47:16 -04: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
1cb7674ebd
Adds a cheap looking pulse animation for magic mirrors so wizards notice they are actually more than normal mirrors
...
Adds a changelog
2015-03-09 12:42:41 -04:00
4071f25270
Simplifies laser reflection code, no more reflect_chance var at the obj/item level.
2015-03-09 12:28:35 +01:00
fbab136950
Merge pull request #8016 from RemieRichards/EmbeddingBalance
...
Embedded Item Balancing. Also fixes #8029
2015-03-09 02:03:18 -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
e5a3694c0f
Adds Napalm as a reagent and merges old napalm into Phlog. Fixes some foam stuff.
2015-03-08 19:43:17 -07:00
662caa554f
Merge pull request #8205 from phil235/AlienDisposalFix
...
Fixes disposal climbing.
2015-03-08 19:41:08 -05:00
8dfcbd8b24
Changes smoke back to TOUCH reaction.
2015-03-08 17:04:45 -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
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
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
7488c47e7a
Merge pull request #8102 from Mandurrrh/tableclimbnerf
...
Balancing out tableclimbing.
2015-03-07 21:39:37 +00: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
0be7709d92
Adds cigar cases; sprites by Nienhaus
2015-03-06 23:16:05 -05: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
0496dcd446
Merge pull request #8169 from dannno/morebarsigns
...
adds more barsigns
2015-03-06 13:35:13 -06:00
13e291a4e9
Merge remote-tracking branch 'upstream/master' into catwalkmachines
...
Conflicts:
code/game/turfs/turf.dm
code/modules/power/power.dm
2015-03-06 19:19:09 +00: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
MrPerson
phil235
Cheridan
Mandurrrh
MMMiracles
dannno
Xhuis
phil235
Remie Richards
Incoming
Iamgoofball
hornygranny
xxalpha