Alex
51e46ef80a
Merge pull request #4211 from Firecage/AIcode
...
Fixes AI code a bit >.>
2014-07-22 15:16:27 +01:00
Cheridan
792ada6990
Merge pull request #4123 from Rolan7/Issue_4045
...
Glowshroom and irrigation fix
2014-07-21 08:40:38 -05:00
Cheridan
f6b9fef747
Merge pull request #4184 from paprka/xtraperiods
...
Removes extra periods from (ban) [reason]
2014-07-21 08:34:50 -05:00
Firecage
c0c9702c13
Fuck fucking spaces
2014-07-21 14:56:23 +02:00
Firecage
feeead99e9
Fixes AI code a bit >.>
2014-07-21 14:21:41 +02:00
Alex
8215cc962c
Merge pull request #4200 from A-t48/ReadyButton
...
Fix pressing ready button multiple times when connecting causing the button state to flip back and forth
2014-07-21 09:06:10 +01:00
Alex
1e35eb0458
Merge pull request #4186 from Ergovisavi/killer_tomato_parasite_fix
...
Fixes issue #4185 - Killer tomatos spawning in mobs/mechs/microwaves/etc
2014-07-21 09:05:21 +01:00
Firecage
fd5c599d2f
Merge branch 'Biogencode' of https://github.com/Firecage/-tg-station.git into Biogencode
2014-07-20 21:38:01 +02:00
Firecage
ad5ad41d98
Changes what Miauw said
...
Signed-off-by: Firecage <firecage@hotmail.com >
2014-07-20 21:36:19 +02:00
Firecage
5a463fafac
Update biogenerator.dm
2014-07-20 21:23:58 +02:00
Firecage
7779a2f7e8
Signed-off-by: Firecage <firecage@hotmail.com>
2014-07-20 21:10:53 +02:00
Alex
5b32928410
Merge pull request #3644 from Kaezon/master
...
Drop contents on ex_act()
2014-07-20 10:49:07 +01:00
unknown
0ebb633a16
Mining Machines: Implementing ex_act()
...
Implemented ex_act() in both the ore redemption machine and the mining
vendor. Sparks were added as a feedback for any explosion that call
ex_act() on these machines.
To allow for the reconstruction of these devices, I have implemented
machine recepies and circuitboard definitions for these devices. I also added
R&D recipies for the circuitboards.
Offline and Open icons have been added for both objects.
Squashed all of my previous commits and fixed the leftover garbled code
from my original rebase.
2014-07-20 01:11:06 -04:00
Kyle Franz
7036ff7735
Fix pressing ready button multiple times when connecting causing the button state to flip back and forth
2014-07-19 21:55:38 -07:00
Miauw
b73a32abb0
Merge branch 'master' of https://github.com/tgstation/-tg-station into changelingshieldsandarmor
...
Conflicts:
code/modules/clothing/head/helmet.dm
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
2014-07-18 12:52:40 +02:00
Alex
8b0c9b4950
Merge pull request #4162 from Kelenius/OfCamerasAndLights
...
Makes camera lights not broken
2014-07-18 09:33:41 +01:00
Ergovisavi
fa32b63189
Fixes issue #4185 , Killer Tomatos will now spawn on the turf that the Killer Tomato plant exists in after the awakening process, stopping bizarre things like it spawning inside another mob or in a mech or other assorted silliness
2014-07-17 21:50:47 -07:00
paprka
b35cee5334
Removes extra periods from ban reasons
2014-07-17 17:51:20 -07:00
Kelenius
b67a751d57
Small fixes for camera lights
2014-07-18 02:44:26 +04:00
Kelenius
b938ad2dde
Camera light uses cameranet and updates on movement now
2014-07-18 02:26:47 +04:00
Kelenius
80824ecac3
Changes light to Giacom's suggestion
2014-07-17 23:59:58 +04:00
Alex
d146eca7b1
Merge pull request #4149 from paprka/lemonlime
...
Updates epic deus ex soda joke
2014-07-17 09:31:40 +01:00
Alex
2d4ca8d363
Merge pull request #4150 from Ikarrus/miningfix
...
[MAP] Mining Delivery System
2014-07-17 09:30:19 +01:00
Alex
9a1a52d280
Merge pull request #4143 from paprka/hatstuff
...
Hat/helmet tweaks
2014-07-17 09:29:14 +01:00
Alex
06bcfbb638
Merge pull request #4154 from paprka/HALTSCUMBAG
...
"HALT" sec hailer clip shortened
2014-07-17 09:27:45 +01:00
Alex
9150770991
Merge pull request #4165 from Cheridan/go_ape2
...
MONKEY MODE: COLON CANCER EXCISION EDITION
2014-07-17 07:48:11 +01:00
Firecage
76e9fed50c
Signed-off-by: Firecage <firecage@hotmail.com>
2014-07-15 22:36:54 +02:00
Cheridan
8fdd519401
Merge branch 'master' of https://github.com/tgstation/-tg-station into go_ape
2014-07-15 14:31:45 -05:00
Kelenius
094d7d139b
Makes camera lights not broken
2014-07-15 20:06:04 +04:00
Firecage
0883d5994d
Merge branch 'master' of https://github.com/tgstation/-tg-station.git
2014-07-15 13:52:44 +02:00
paprka
a10f614ec4
armor
2014-07-14 12:44:38 -07:00
Alex
72423a7bd0
Merge pull request #4059 from Miauw62/goodbyeparapen
...
Replaces the parapen
2014-07-14 12:47:14 +01:00
Alex
5deccb030c
Merge pull request #4125 from Jordie0608/mygrandmacheatedconstantlyatsnapwheniwasatoddler
...
AI spacecarp hologram
2014-07-14 09:25:37 +01:00
Firecage
07a16bbbf7
Signed-off-by: Firecage <firecage@hotmail.com>
2014-07-14 06:06:04 +02:00
paprka
d853909f2b
HALT HALT HALT
2014-07-13 15:43:32 -07:00
paprka
d0f7641bd0
syndies use swat helmets too!
2014-07-13 14:38:34 -07:00
Firecage
4db7359cf6
Signed-off-by: Firecage <firecage@hotmail.com>
2014-07-13 22:34:44 +02:00
Firecage
e13e4ca445
Signed-off-by: Firecage <firecage@hotmail.com>
2014-07-13 22:32:34 +02:00
Firecage
d5a7885842
Signed-off-by: Firecage <firecage@hotmail.com>
2014-07-13 22:29:37 +02:00
ikarrus
0a62bfb159
part II
2014-07-13 13:43:07 -06:00
ikarrus
9d2bed1501
[MAP] Mining Delivery System
...
-Redone the delivery system on mining to send the unrefined ore from the outposts to the mining station, ready to be picked up by miners, instead of being fed directly into the smelting line
-Smelting line still exists, but starts blocked off
-Updated paper with correct instructions on where to redeem points
-Fixed mint's atmos and door name. Added a camera there, too.
2014-07-13 13:30:57 -06:00
paprka
bcbcb204a5
updates epic deus ex joke
2014-07-13 11:33:33 -07:00
paprka
b24d0561c7
fixes redundant flag removal
2014-07-13 10:00:44 -07:00
paprka
46690daed6
small tweak to desc
2014-07-12 18:11:38 -07:00
paprka
2f78ee55ed
buff to job hats
2014-07-12 18:01:12 -07:00
Alex
0dc8aabd42
Revert "Spinning"
2014-07-13 00:55:18 +01:00
Aranclanos
dec8444e12
Merge pull request #4118 from Aranclanos/spinning
...
Spinning
2014-07-12 20:52:55 -03:00
Aranclanos
4b188a4dea
Merge pull request #4139 from Aranclanos/immovablerods
...
Fixed the crash with immovable rods
2014-07-12 20:46:06 -03:00
Aranclanos
33ee96dc39
Fixed the crash with immovable rods
2014-07-12 20:44:48 -03:00
Alex
d8c9c8de9b
Merge pull request #4131 from paprka/fixxies
...
Paprika's epic fixes and shit
2014-07-12 21:11:31 +01:00
