1a58a3cf86
Merge pull request #2265 from fleure/watertank
...
Reduced watertank slowdown slightly
2014-01-07 08:16:10 -08:00
58159a00ad
Merge pull request #2105 from RobRichards1997/20/12/2013-Poker_Tables
...
Poker tables
2014-01-06 14:35:03 -08:00
333d0ed045
Reduced watertank slowdown slightly
2014-01-06 18:26:06 +00:00
bb9c09df46
Obsoletes flags = FPRINT | TABLEPASS*
...
*TABLEPASS was already totally obsolete.
FPRINT was used, but it was on virtually everything anyway.
Removes those flags from every instance where they were used. Also assigned and removed other flags where it made sense.
If it is desired, I can revive the flag as NOFPRINT, which would retain the original functionality, though inverted. That way it would be be used only where it was intentional (holodeck items could use this for example).
2013-12-30 15:03:17 -06:00
d5ddac3a00
Merge pull request #1934 from RobRichards1997/30/11/2013-Toxic-Converter-Cyberlimb-Fix
...
Cyber limbs fixes [FIXES #1920 ] + [Fixes #2180 ] + [RUNTIME FIX]
2013-12-30 10:23:54 -08:00
d3d4c79946
Merges Heal_Damage and Heal_robotic_damage procs
...
like I should have done in the first place.
Corrects all usages of Heal_damage so it works with the changed version.
Same goes for Heal_robotic_damage
2013-12-29 17:40:12 +00:00
171147b1bf
Fixed toolbox parent object giving error
2013-12-28 14:51:35 +00:00
b9efeaa932
Merge pull request #2014 from kyrahabattoir/ItemNameFixingRound3
...
Item name fixing round3
2013-12-26 23:14:15 -08:00
0c8c6a5de2
Fixed #1119 folding boxes updates sprites properly
2013-12-22 19:21:45 +01:00
df626a1f06
correct paint can names and plural status, corrected pill box names, corrected lockbox names.
2013-12-22 11:28:10 +01:00
e7579e2aa8
Merge pull request #1986 from Perakp/janitorCartFix
...
Fixes janiborg interaction with janicarts
2013-12-21 15:01:37 -08:00
516ec6076d
Merge pull request #2102 from Razharas/Flamethrower
...
Fixes flamethrowers shooting through stuff
2013-12-21 13:57:33 -08:00
9d24a900ae
Merge pull request #2066 from Perakp/slipFix4
...
No slipping when lying down
2013-12-21 13:54:39 -08:00
9dd0432697
Implements Gia's Superior Idea.
...
fixes some directions on Nienhaus's sprites
2013-12-21 20:09:52 +00:00
b8d8975fe6
Fixes Kaze's Suggestion
...
Standardises the fuck out of Table attackby's (NO COPYPASTA ANYMORE YAY)
Adds a new proc which does the above.
2013-12-21 18:22:49 +00:00
c40af6ae40
Update icons after item is placed in cart.
2013-12-21 09:50:15 +02:00
65e0931d55
Merge branch 'master' into janitorCartFix
...
Conflicts:
code/game/objects/items/weapons/storage/storage.dm
2013-12-21 09:40:06 +02:00
ae6a4d9b18
Fixes flamethrowers shooting through stuff
...
Fixed #2059
They need to be fixed more, but thats a theme for another PR
2013-12-20 22:57:41 +04:00
0fdcd42592
Merge pull request #2054 from Cheridan/Nuke
...
Nuke Ops Tweaks: Flamer and Mechas
2013-12-19 13:37:32 -08:00
2f70aaadb3
Removes magic numbers and an useless check
...
- it shouldn’t runtime.
2013-12-18 22:31:07 +02:00
68ff764463
Subtypes of janiborg tools
...
- The other way of fixing it. I’m not sure why this is better.
- Removed condescending messages to cyborgs.
2013-12-18 20:44:24 +02:00
7bb4cf6a79
Makes the attackby() of storage objects return 0 if the can_be_insterted() fails. This will fix hand labelers on pill bottles.
2013-12-18 12:25:39 -03:00
b54cab665a
No slipping when lying down
...
- No slipping when lying down
- Doesn’t change slipping mechanics otherwise.
2013-12-18 15:03:03 +02:00
358a85eb3d
Completed the transition to a new proc
...
All the logging i have found in the code was changed to use the
proc(maybe i missed something)
Killed all runtimes found so far
Proc now handles all the checks, no need to add checks in the body of
object
2013-12-17 22:56:04 +04:00
b68eadfb14
Nuke Op Tweaks
...
In response to feedback:
Dark Gygax no longer has the scattershot. Instead, it has a modestly powerful carbine loaded with incendiary rounds, solidifying its role as a hit-and-run and squad-support platform.
The Mauler now has the scattershot in addition to its existing arsenal, to give it that edge against crowds that you'll need at those higher populations.
Included with the new mecha weapon is a minor code refactoring of mech guns... There shouldn't be any noticable changes to the user. mech code is awful, guys
New sound effect for mecha launchers (Having the same sound effect for projectile launching and exploding drove me nuts.).
Nuke op flamethrowers now start with a full tank.
2013-12-16 23:56:49 -06:00
ceec829294
Tons of typo fixes and renames Centcomm to Centcom. Manual merge of #1950 .
2013-12-13 21:14:23 +00:00
3496dc4e0a
Merge branch 'master' into ItemNameFixingRound3
2013-12-10 17:32:45 +01:00
552c77fd81
Merge pull request #1990 from VistaPOWA/aluminium
...
Replaces 'aluminum' with 'aluminium'.
2013-12-08 07:32:54 -08:00
498ba1acd4
Merge pull request #1964 from Limeliz/href-fixes-round-3
...
Href fixes round 3
2013-12-08 07:10:15 -08:00
8251c0ea42
Merge branch 'HydroTweaksNov2013' of https://github.com/Rolan7/-tg-station into HydroTweaksNov2013
...
Conflicts:
html/changelog.html
2013-12-08 06:29:48 -03:00
1041d7081d
Replaces 'aluminum' with 'aluminium'.
...
Hopefully there won't be a grammar war because of this.
2013-12-07 14:42:25 +01:00
e4c3ca5fb8
Janiborgs can no longer place their mop, light replacer or trash bag in the janicart. Fixes #1954
...
Language fix "this the" -> "the" in storage.dm
2013-12-06 13:00:11 +02:00
a4a13681f3
Merge branch 'master' of https://github.com/Razharas/-tg-station into ImGonnaStingYa
...
Conflicts:
code/game/gamemodes/changeling/changeling_powers.dm
2013-12-05 07:01:09 -03:00
e2a6628aec
Removing href-tags from log_game in grenade.dm
...
Cleaning up after Ikarrus @ 2f92f67a
2013-12-03 21:33:58 +01:00
3e642f7adc
Merge branch 'master' of https://github.com/tgstation/-tg-station into HydroTweaksNov2013
2013-12-01 21:04:20 -05:00
e3d2f9ffe7
DONE Leather gloves now have heat protection like black gloves (to allow removing lights bulbs/tubes)
...
DONE Plants require 4 light, mushrooms only 2
DONE Harvesting should report how many items were harvested (whether plantbag is used or not)
DONE Plantbag should have a mode to only pick up one kind of plant at a time. Trash and ore bags too.
DONE 1 unit of mutagen should cause non-species mutations. (Radium too)
DONE Uranium should be like radium but even weaker
2013-11-28 23:07:50 -05:00
fc94341bce
Removed the impossible NOBLOODY flag, replaced it with a simple proc. rejects_blood()
2013-11-28 05:45:49 -03:00
3fed8dd8f6
Merge branch 'Cybernetic-limbs' of https://github.com/RobRichards1997/-tg-station into Cybernetic-limbs
...
Conflicts:
code/modules/mob/living/carbon/human/human_defense.dm
2013-11-26 22:03:26 -03:00
d7b6001f98
Merge pull request #1835 from Cheridan/NukePR
...
Scale Ops 1.1
2013-11-24 13:51:07 -08:00
2edbd69ce3
what is even the difference between w_class 1 and 2 anyway geez
2013-11-24 14:35:12 -06:00
75ff8338b8
Fixes bible spam
...
Fixes "r_arm" nonsense
Fixes appendicitis carrying over to robotic chest
2013-11-24 15:24:55 +00:00
d9fc4bdd5c
code/game/object/items/weapons/* lowercase pass
...
code/game/object/structure/* lowercase pass (start)
2013-11-24 08:49:34 +01:00
a58b0169ae
Tiny abstract flag improvement
...
By petes request made items with ABSTRACT unequipable
2013-11-24 06:16:22 +04:00
df9bc262bf
Merge pull request #1798 from kyrahabattoir/vending-reloadedB
...
Vending reloaded!
2013-11-23 11:40:34 -08:00
0ec59be055
Adrenalin implants will now actually add their reagents instead of runtime and cry.
2013-11-22 01:47:18 -03:00
d814414227
Scale Ops 1.1
...
Reduces the costs of some items based on feedback.
Op lockers now start with a new miniaturized jetpack.
2013-11-20 17:59:02 -06:00
e6ee419f47
ADDED costume restocking unit
...
REMOVED many useless comments
ADDED invoke vending_refill consutructor superclass
ADDED: Cargo can order the autodrobe supply crate
2013-11-18 19:15:23 +01:00
6042dbe667
Merge branch 'master' into vending-reloadedB
2013-11-18 15:06:08 +01:00
b7b45881b2
Made abstract a flag and other stuff
...
Everything that had abstract var now has ABSTRACT flag
Everything that checked abstract var now checks ABSTRACT flag
Fixed some runtimes
Fixed click code and face direction changing while cuffed
Added del to all attack_* of the proboscis in case shit goes real
AStar is still weird so added a simple sanity check
2013-11-18 03:53:50 +04:00
e71ea3289e
Merge branch 'master' of https://github.com/tgstation/-tg-station into 13/10/2013-Limb/organ-stuff
...
This probably broke everything... :(
2013-11-17 18:09:14 +00:00
Cheridan
Fleure
Aranclanos
Robson Richards
Miauw
Kyrah Abattoir
Giacom
Perakp
Razharas
VistaPOWA
Emil
Rolan7