a5571508d0
Merge pull request #2049 from Incoming5643/wands3
...
Magic Mania: Sprites, Fixes, Balancing, and Mini-Features
2013-12-29 11:47:59 -08:00
89006319dc
Merge pull request #2179 from fleure/vending
...
Toggling vending machine's voice now works
2013-12-29 08:14:06 -08:00
0b299990e5
Also machines actually vend now!
2013-12-29 16:08:05 +00:00
92636bbe01
Merge pull request #2168 from fleure/toolbox
...
Fixed toolbox parent object giving error
2013-12-29 08:00:11 -08:00
2f2fc92742
Toggling vending machine's voice now works
2013-12-29 13:50:35 +00:00
71aa7d0857
Merge pull request #2157 from Cluwnes/pocketcards
...
Makes cards pocketable.
2013-12-29 02:58:28 -08:00
093d9b386d
Merge branch 'master' of https://github.com/tgstation/-tg-station into wands3
2013-12-29 02:20:09 -05:00
e06e9ffa4c
Merge pull request #2047 from Miauw62/condimentpacks
...
Condiment packs: The Condipacking
2013-12-28 21:16:43 -08:00
f6aae4898e
Merge pull request #2159 from Cluwnes/succes
...
Succesful fixes
2013-12-28 16:17:03 -08:00
66fdd58424
Merge pull request #2161 from Cluwnes/gaslogging
...
Adds ckey logging to canisters
2013-12-28 16:10:52 -08:00
171147b1bf
Fixed toolbox parent object giving error
2013-12-28 14:51:35 +00:00
648fe11dd6
Merge pull request #2070 from Miauw62/digivalves
...
Digital valves can now be made and unwrenched. Fixes pipe fitting names.
2013-12-27 18:14:46 -08:00
71dc46d4cd
Adds ckey logging to canisters
...
Lets admins see the ckey as well as the name of those who toggle release valves on canisters.
2013-12-27 16:46:00 -08:00
2482fd0702
Makes cards pocketable.
...
Adds w_classes to cards so you can actually pocket the things.
2013-12-27 15:49:21 -08:00
a8eeb943cd
Succesful fixes
...
Fixes instances of "succesful" and "succesfully".
2013-12-27 15:40:01 -08:00
392c6d51a9
Merge branch 'master' of https://github.com/tgstation/-tg-station into wands3
2013-12-27 02:33:47 -05:00
b9efeaa932
Merge pull request #2014 from kyrahabattoir/ItemNameFixingRound3
...
Item name fixing round3
2013-12-26 23:14:15 -08:00
7c2fbba76f
Merge pull request #2111 from Perakp/voiceChangerFix
...
Voicechanger fix
2013-12-26 22:06:38 -08:00
26a1bb65f2
Merge branch 'master' of https://github.com/tgstation/-tg-station into wands3
...
Conflicts:
code/modules/mob/death.dm
code/modules/mob/living/carbon/alien/death.dm
code/modules/mob/living/carbon/brain/death.dm
code/modules/mob/living/carbon/human/death.dm
code/modules/mob/living/carbon/monkey/death.dm
code/modules/mob/living/silicon/death.dm
code/modules/mob/living/silicon/robot/death.dm
2013-12-27 00:55:44 -05:00
aeec1c0add
Merge pull request #2116 from Giacom/sleeper_fix
...
You can now move out of sleepers by moving.
2013-12-26 21:36:30 -08:00
f36a7d764c
Merge pull request #2110 from Perakp/mimeSpells
...
Changes mime abilities into spells
2013-12-26 20:56:40 -08:00
ef25332511
Merge pull request #2125 from Miauw62/ifitfeelsright
...
Folding boxes updates sprites properly
2013-12-26 20:13:09 -08:00
013b0a94f7
Merge pull request #2121 from Miauw62/firealarms
...
You can no longer farm infinite fire alarm electronics.
2013-12-26 19:50:26 -08:00
7403f17da2
Fixed cable coils getting negative lengths by computers.
2013-12-23 14:33:55 +01:00
0c8c6a5de2
Fixed #1119 folding boxes updates sprites properly
2013-12-22 19:21:45 +01:00
0338a66c2a
Adds fingerprints to a bunch of stuff. De-texts computer build paths.
2013-12-22 18:57:33 +01:00
255bb90996
Fixed #1572 You can no longer farm infinite fire alarm electronics.
2013-12-22 17:08:02 +01:00
9e40407906
Merge branch 'master' of https://github.com/tgstation/-tg-station into condimentpacks
...
Conflicts:
code/modules/reagents/reagent_containers/food/condiment.dm
2013-12-22 15:19:23 +01:00
97482fb5e9
* You can now move out of sleepers by moving.
...
* Made the sleeper Del() eject it's contents.
2013-12-22 12:33:59 +00:00
df626a1f06
correct paint can names and plural status, corrected pill box names, corrected lockbox names.
2013-12-22 11:28:10 +01:00
58d0ed5221
Merge pull request #2094 from RobRichards1997/19/12/2013-Sec-see-Sec-Sprites
...
Security Sprite updates.
2013-12-21 15:24:14 -08:00
40929b37d3
Merge pull request #2093 from Giacom/small_fixes_and_tweaks
...
Small Tweaks and Fixes
2013-12-21 15:12:01 -08:00
f00c80bd43
Merge pull request #2104 from Giacom/gulag_therevenge
...
[MAP] The Gulag: The Revenge: Part 2.5
2013-12-21 15:05:57 -08: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
5fb0d05dd1
Merge pull request #2096 from Aranclanos/SweetLindaNobodyWillTouchYou
...
Small fixes for Linda.
2013-12-21 13:57:15 -08:00
f713a3368d
Merge pull request #2100 from Razharas/MechShit
...
Fixes mechs click through windows and what not
2013-12-21 13:56:21 -08:00
9d24a900ae
Merge pull request #2066 from Perakp/slipFix4
...
No slipping when lying down
2013-12-21 13:54:39 -08:00
5fe1413363
Merge pull request #2083 from Razharas/Shame
...
Fixes add_log being used in an obsolete way
2013-12-21 13:46:34 -08:00
949fedceda
Merge pull request #2067 from Deantwo/master
...
Shuttle launch timer cannot be shortened when less than 11 seconds are left
2013-12-21 13:45:27 -08:00
90ecfcbc4b
Merge pull request #2063 from Nienhaus/master
...
Posters
2013-12-21 13:37:20 -08:00
b1996a77e1
Fixes AI seeing the name of the person who speaks over radio using a voice changer.
2013-12-21 23:01:52 +02:00
0d1ba1eccf
Changes mime abilities into spells. Admins can now give these from the 'give spell' menu. Unlike previous mime abilities, these are not transferred when a mime is cloned.
2013-12-21 20:54:07 +02:00
a27ec365ef
Feature: Changed how used books of mindswap punish people. Now if you use a used mindswap book it marks you to be used in a mindswap with the next unfortunate soul who reads its. Some Limitations: You can escape the impending mindswap by changing forms or being dead when the next time someone tries to read the book. You can of course also just keep the book safe or destroy it if you accidentally read one. Only works with things that have hands. Consider intentionally reading one as a monkey then giving it to the captain.
...
Feature: After some serious testing (and because it was already being done on live servers thanks to wabbajack() preserving spells) I've removed the compatible_mobs list for mind_transfer, meaning you can now mind transfer to any player controled living mob.
Flowery fluff that no one would ever care about: changes the mindswap message for trying to swap into a dead guy, since a spell holder isn't nessisarily a space wizard
2013-12-21 12:23:50 -05:00
e3f82955e4
Merge pull request #2080 from Razharas/no
...
Fixes morgue trays used by ghosts and what not
2013-12-21 01:12:04 -08: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
20a57b9917
Merge pull request #2030 from KazeEspada/gunhardest
...
Gun HARDEST!
2013-12-20 23:18:55 -08:00
47545f439e
* Added ore boxes to the gulag, and added a conveyor belt which goes outside and has a loading machine, which will take the ore from the orebox.
...
* Added sprites for the stacking machine going in the reverse direction, just set the dir to 1 instead of 2.
* Added prison intercoms which will not broadcast until someone hacks it. Added these intercoms in the gulag, the perma brig and the brig cells.
* When a prisoner has received enough points for freedom, if they try to move the shuttle, or open the middle door, while someone is on it they will get an error message. This way there is no way for a free'd prisoner to release their fellow prisoners once they have reached their point target. The shuttle will depart right away when you call the shuttle from the stacking console, to stop prisoners from getting on while it departs.
2013-12-20 22:09:06 +00: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
Aranclanos
Rockdtben
fleure
Giacom
Incoming
Cheridan
Cluwnes Honk
Miauw
Kyrah Abattoir
Perakp
Razharas