4ba95ec038
Merge pull request #1425 from RobRichards1997/21/09/2013-Engiborg-Floortiles
...
Gives Engiborgs Floortiles
2013-09-28 15:43:58 -07:00
c219c9e4ba
Merge pull request #1405 from Incoming5643/toyAI
...
Adds a toy AI to the arcade machine prize list
2013-09-28 14:58:53 -07:00
6d87e5a11d
Merge pull request #1389 from KazeEspada/computers
...
Cleans up computer code severely.
2013-09-28 14:48:42 -07:00
4ea0fe35b0
Merge pull request #1469 from Ergovisavi/ergo_mobs_on_fire
...
Mobs on fire: The return: The reckoning
2013-09-28 10:00:24 -07:00
3bd07c39de
Swapped extinguishers back to their default value. We'll see how it plays out.
2013-09-28 09:49:53 -07:00
f5e3037e6d
Merge branch 'master' of https://github.com/Giacomand/-tg-station into nobreathe
...
Conflicts:
code/game/objects/effects/effect_system.dm - Resolved.
2013-09-28 01:07:20 +01:00
6731722bff
Made blob spores a bit more useful! On death they will release a spore cloud which will slightly (0.5 per tick) damage people and cloud your vision until the effect wears off.
2013-09-27 10:24:58 +01:00
705786b482
Cleaning up (2/2)
2013-09-26 12:50:37 -04:00
9035fa97de
Cleaning up (1/2)
2013-09-26 12:49:38 -04:00
18eb119ae2
Merge pull request #1415 from Cheridan/ProjectStormchaser
...
"Anomaly" Events!
2013-09-25 10:53:21 -07:00
09663b8507
-Removed an unnecessary typecast and duplicate function call from the airlock painter code.
2013-09-25 11:59:49 +02:00
da5ff1aca6
Merge branch 'master' of https://github.com/tgstation/-tg-station into computers
2013-09-24 14:07:51 -07:00
2668f82633
-You can now remove the toner cardridge from an airlock painter by clicking on the painter in your hand.
...
-You can now install a toner cardridge into an airlock painter by clicking on it with the toner.
2013-09-24 22:33:32 +02:00
0882d41574
Fixes and improvements to airlock painters.
...
-Airlock painter can now be used on finished airlocks to change their paintjob. Keep away from the Clown.
-Airlock painter description up to standards. It still shows the current ink level.
-Fixed a bug with painting airlock assemblies where painted glass airlocks deconstructed to assemblies reconstructed to airlocks would lose their glass status.
-Airlock painters now make a sound (effects/spray2.ogg) when used to paint an airlock.
2013-09-24 21:31:39 +02:00
50c5e7ee74
Cleans up the new cyborg floortile, Thanks for spotting it Aran!
2013-09-24 15:55:06 +01:00
249ac94c59
Took the blink out of gift wrapper
2013-09-24 01:17:13 -04:00
2f7cdd3fde
Merge pull request #1430 from Malkevin/sechailer
...
Sec Hailer: Day 1 bug fixes
2013-09-23 22:05:40 -07:00
87ed1a2e1f
Merge pull request #1417 from fleure/janitor
...
Janitor PDA now locates the cart, removes old bucket locator
2013-09-23 21:17:41 -07:00
8f08a2e13f
Updated the proc to allow it function on objects other than the target.
...
Changed PDAs to use the proc
2013-09-24 00:27:43 +01:00
08a8884b0c
Merge branch 'master' of https://github.com/tgstation/-tg-station into radcollectors
2013-09-23 22:45:28 +01:00
27bc778449
Merge branch 'master' of https://github.com/tgstation/-tg-station into computers
2013-09-23 13:37:00 -07:00
75d9092940
Changes the cooldown on toys to use spawn
...
Removes blink toys from the code. RIPiss
2013-09-23 14:41:54 -04:00
566e1cc166
Merge branch 'master' of https://github.com/tgstation/-tg-station into pr/1415
...
Conflicts:
tgstation.dme
2013-09-23 11:04:33 -05:00
f887f57511
Merge pull request #1412 from Rolan7/RainbowSwords
...
Rainbow swords
2013-09-23 01:36:10 -07:00
c9d26c99f9
Removed the black mask, it really did look too much like a gimp mask.
...
Color scheme is now: HoS Red/Blue, Warden Red only, Officers White
Recolored the blue mask, should look much better now:
https://dl.dropboxusercontent.com/u/95696802/Commits/secmask/newblue.png
Moved the ..() in the departmental lockers after the departmental equipment so that they're at the bottom of the pile instead of on top, which was annoying
2013-09-21 23:49:42 +01:00
38d7374bc2
Makes circuits into type paths. Dna modifiers had a bad string that showed up when converted into a type path. Power monitors are now actually computers. Makes smashing computers red.
2013-09-21 14:41:50 -07:00
772acc95c4
mobs on fire system, by ergovisavi
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-09-22 04:59:48 +10:00
bac1d6e942
Merge pull request #1390 from Petethegoat/eventzzzzz
...
Eventzzzzz
2013-09-21 10:25:54 -07:00
5c2b2865e0
Merge pull request #1410 from Petethegoat/fixes
...
Issue fixes
2013-09-21 10:10:09 -07:00
4995b64c18
Moves the plasteel/cyborg into plasteel.dm, works the same, Convenience
2013-09-21 17:27:39 +01:00
6dba8dec10
Gives Engiborgs Floortiles
...
Rechargestation is set to replenish them aswell
2013-09-21 15:51:19 +01:00
86f843ad60
Merge branch 'master' of https://github.com/tgstation/-tg-station into radcollectors
2013-09-21 11:51:41 +01:00
760589cd35
Janitor PDA now locates the cart, removes old bucket locator
2013-09-21 01:21:13 +01:00
cb3de0d038
Merge pull request #1371 from Malkevin/sechailer
...
Sechailer mask (now finished)
2013-09-20 13:47:12 -07:00
04fbcb4104
It's now hacking via multitool instead of emagging via emag... maybe people will actually do this (:
2013-09-20 13:12:30 -04:00
6dcd952be9
Removed optional use of .src for Aranclanos
2013-09-20 11:06:36 -04:00
1939098175
Fixes lights on anomalies, reverts my accidental change to device.dmi
2013-09-20 00:44:12 -05:00
d19e7f6493
Converts bluespace events into the anomaly system. Adds some sprites and polishes up some effects
...
Next up: Moving all of the anomalies into an event subtype to cut down on copied code!
2013-09-19 22:08:04 -05:00
d2d664a193
Used Aranclanos's code for combining swords without dropping both hands! Re-added the icons to the fresh DMIs. Self-testing found no issues, this is ready for someone to approve.
2013-09-19 18:49:32 -04:00
ce0828c600
Radiation Collector analyzing
...
Checking a collector's last power output via analyzers has been moved to multitools, because that actually made sense (betcha didn't know this existed, I know I didn't)
Analyzers can now be used to check the gas level of the tank in a loaded radiation collector (yay no more crowbars)
You can also use them on pipes to check gas levels (yay no more pipe meters)
Codewise, the several inconsistant instances of the analyzer code have been moved to a single proc. The following have been converted to use this:
-Pipes (they didn't have this before. Also changed the attackby code to be less dumb...)
-Pipe tanks (you know those big ones in maint everyone forgets about)
-Portable Atmospherics (canisters, air pumps, scrubbers)
-Flamethrower
-Tanks
-And now collectors
2013-09-19 22:15:11 +01:00
46b2b122c2
Should bring admins.txt in line with tgstation upstream, and the icon files match the upstream ones too. The icon files do still need to be edited, of course.
2013-09-19 15:46:35 -04:00
7b9e32c0da
Merge branch 'master' of https://github.com/tgstation/-tg-station into RainbowSwords
...
Conflicts:
code/game/objects/items/weapons/twohanded.dm
config/admins.txt
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
2013-09-19 14:31:05 -04:00
26088805b8
Fixes #121 .
2013-09-19 15:54:02 +01:00
580294685b
Merge branch 'master' of https://github.com/tgstation/-tg-station
2013-09-19 03:22:20 -05:00
115faf4954
Anomaly Neutralization
...
Anomalies can now be scanned to determine their frequency, and neutralized by sending a signal on that frequency.
2013-09-19 03:20:44 -05:00
a8e4e185ae
Adds a traitor item ToyAI that can upload the last ion law it generated via an upload console. Note that this is NOT a normal ToyAI that has been emagged, but rather an upload board mimicing a ToyAI (with a tell in the description).
...
This ToyAI has been added to the AI subversion bundle, note that since a traitor with this bundle already gets a hacked AI module there's no added benifit to it being there, its just for whimsical traitors who'd enjoy adding a little spice to the AI or false flag the changes as a badmin ioning an AI.
2013-09-19 01:15:39 -04:00
a11b75f31e
Procs out Ion law generation
2013-09-18 20:42:10 -04:00
4638e0d0c4
Adds a toy AI to the arcade machine prize list. When you press it it'll annouce a random Ion Law to everyone around. This has a cooldown to prevent spammage and to make sure that the switch hell that is AI ion law code isn't taxing things too much (it looks a lot worse than it actually runs).
...
This replaces the blink toy in arcade machines, because they were a terrible booby prizes that no one in their right mind would mistake for something threatening because who in their right mind would leave a syndicate summoning beacon lying around instead of the thing that it summons.
2013-09-18 19:59:48 -04:00
409e47ac05
Ported the Clogged Vents event from Sayustation.
...
Adds a silent parameter to /datum/effect/effect/system/chem_smoke_spread/set_up(), which disables admin notification.
2013-09-18 16:47:50 +01:00
1f6852232b
Merged the blood trails from VistaPOWA to the latest tg code
2013-09-17 23:54:53 -03:00
Aranclanos
Cael Aislinn
Ergovisavi
Giacomand
Incoming5643
Pete Goodfellow
Ricotez
KazeEspada
Robson Richards
Cheridan
Malkevin
Fleure
Rolan7
