3432aaf583
Adds a christmas tree to the bar
...
Adds a festivus pole to the science break room
Adds a santa outfit to the captains office so he can spread cheer to the crew
2013-12-08 13:23:55 -05: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
c1304ef0c8
Merge pull request #1971 from adrix89/Crate_Explostion
...
Fixed crate not blowing up properly.
2013-12-07 04:54:09 -08: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
870d23ccf4
Merge branch 'icons' of https://github.com/Jordie0608/-tg-station into icons
...
Conflicts:
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
icons/obj/weapons.dmi
2013-12-05 08:32:53 -03: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
49282cd604
Fixed not blowing up properly.
...
Use closet ex_act instead.
2013-12-04 10:03:12 +02:00
e2a6628aec
Removing href-tags from log_game in grenade.dm
...
Cleaning up after Ikarrus @ 2f92f67a
2013-12-03 21:33:58 +01:00
72e16e4482
Removing href-tags from log_game in transfer_valve.dm
...
Not sure I'm doing this the best way, but I couldn't come up with a cleaner way. Suggestions are welcome!
2013-12-03 16:54:38 +01:00
e5fd8f7070
Removing href-tags from log_game in transfer_valve.dm
...
Not sure I'm doing this the best way, but I couldn't come up with a cleaner way. Suggestions are welcome!
2013-12-03 10:39:53 +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
852e5deb44
Merge branch 'master' of https://github.com/tgstation/-tg-station into camera_bug_sprite
...
Resolved Conflicts:
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
2013-11-26 21:33:07 +00:00
b0641be44d
Merge pull request #1833 from kyrahabattoir/ItemNameFixingRound2
...
Item name fixing round2
2013-11-26 12:02:26 -08:00
503d0b76ab
Recommit from clean
2013-11-26 05:23:43 +11:00
4a4658bc93
Merge pull request #1808 from RobRichards1997/17/11/2013-Turret_Runtime_Fix
...
Fixes Turret/Atom Moveable Explosion Runtime [BUGFIX]
2013-11-24 22:55:24 -08: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
7e2b7805cc
FIXED: inconsistencies with stack item names.
...
CHANGE: stacks are gender = PLURAL by default because it fits.
2013-11-24 00:14:46 +01:00
fe8ddd4bef
code/game/objects/items/robot/* lowercase pass
...
NOTE: vision modes have to be proper.
2013-11-23 23:41:21 +01:00
df9bc262bf
Merge pull request #1798 from kyrahabattoir/vending-reloadedB
...
Vending reloaded!
2013-11-23 11:40:34 -08:00
865fad0d0b
Merge pull request #1841 from Giacom/sound_pro
...
Fixes certain objects not using 3D sounds.
2013-11-23 10:33:03 -08:00
3e3e193c79
Camera bug sprites from Rob
2013-11-23 17:10:43 +00:00
0ec59be055
Adrenalin implants will now actually add their reagents instead of runtime and cry.
2013-11-22 01:47:18 -03:00
17fd5d6cdc
* Fixes certain objects not using 3D sounds.
...
* Gave the piano a bigger falloff.
* Capped the sound x/z to 7.
2013-11-21 23:50:53 +00: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
ab566551af
Merge pull request #1789 from havocx42/WindowPush
...
Attacking unanchored windows with a wrench turns them into stacks of glass
2013-11-20 11:19:16 -08:00
225a906eda
code/game/objects/items/* (root) lowercase pass
...
code/game/objects/items/devices/* lowercase pass
2013-11-20 19:15:00 +01:00
109c1065c7
code/game/objects/effects/* lowercase pass
...
NOTE: created a baseclass for /obj/effect/decal/remains/*
2013-11-20 18:03:41 +01:00
a4e71ce1c0
Removed ..() from Del proc
2013-11-20 09:02:37 +00:00
bae3bcff3b
Merge pull request #1801 from Giacom/explosion_sound
...
3D Sounds + Rewrote the explosion sound to be more optimized and to be more dynamic.
2013-11-19 15:49:45 -08:00
62051364ef
Changed the heavy impact multiplier to 20.
2013-11-19 21:35:36 +00:00
92c0f666f7
When removing a window the Deconstruct sound is played instead of shatter
...
Adds the ..() call to del()
2013-11-19 13:15:54 +00: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
c012a7aee3
Changed playsound() to use less code. Playsound now loops through the player list, which means you do not have to check inside closets/objects/other mobs to play sounds.
...
Made all sounds use 3D sounds! This includes sounds which have less volume the further away you are from it.
The piano now uses 3D sounds.
Changed how the far explosion sound is calculated.
2013-11-18 14:38:49 +00:00
6042dbe667
Merge branch 'master' into vending-reloadedB
2013-11-18 15:06:08 +01:00
de227487a8
Merge pull request #1792 from Giacom/PDA_tweak
...
AIs can no longer intercept messages randomly. Captain PDA no longer starts off.
2013-11-17 22:34:03 -08: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
fc1211f1b4
Merge pull request #1803 from kyrahabattoir/examine-cleaning
...
Examine cleaning
2013-11-17 13:12:09 -08:00
583cdb1781
Merge pull request #1763 from fleure/medmech
...
Fixed some container escape issues
2013-11-17 13:10:53 -08: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
4b002b2e7a
Fixed some snowflakes in the examine grenade code and redundancies in their descriptions.
2013-11-17 14:59:48 +01:00
Incoming
Aranclanos
VistaPOWA
Giacom
Perakp
adrix89
Emil
Rolan7
Jordie0608
Cheridan
Robson Richards
Kyrah Abattoir
Razharas
havocx42