Commit Graph

1946 Commits

Author SHA1 Message Date
Incoming
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
Incoming
a11b75f31e Procs out Ion law generation 2013-09-18 20:42:10 -04:00
Incoming
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
Aranclanos
95bfb86226 Merge pull request #1280 from Ergovisavi/improvexplosive
Adds createable Improvised Explosives!
2013-09-12 02:30:04 -07:00
Ergovisavi
fdb72fa3e7 Moves the fuel remaining in the fuel tank check around 2013-09-11 18:33:56 -07:00
Ergovisavi
a224d36dd3 Ups the required fuel for improvised explosives to 50 units. 2013-09-09 01:50:01 -07:00
Ergovisavi
c2fe5edbd9 Adds a text message when a welding fuel tank has less than 30 fuel and you try to fill an iedcasing with it
No more -amount, cable coil is properly used up.
2013-09-08 23:20:15 -07:00
Fleure
73d25c7c04 Minor atmos fixes for resin and mineral structures 2013-09-08 01:01:12 +01:00
MrPerson
bd27a8a023 Merge pull request #1292 from Cheridan/master
Removes an unused var from every obj
2013-09-04 12:54:40 -07:00
Cheridan
a830ba2740 Merge pull request #1282 from MrPerson/grammer
Grammar fixes
2013-09-04 10:01:31 -07:00
Cheridan
899a53787a Removes an unused var defined for every obj. 2013-09-03 09:38:30 -05:00
Ergovisavi
926f809f3f removed redundant ..() from ghettobomb.dm 2013-09-02 15:30:27 -07:00
VistaPOWA
aee35c6c08 Removed unneeded 'this's 2013-09-02 13:20:02 +02:00
VistaPOWA
761731c27a Merge git://github.com/tgstation/-tg-station into critter_crates
Conflicts:
	icons/obj/storage.dmi
2013-09-02 13:18:15 +02:00
MrPerson
2780149353 Merge pull request #1279 from Neerti/9-1-2013-adding_replica_spesshelmet_arcade
Replaces arcade replica suit prize with a box containing a replica suit & helmet
2013-09-02 04:00:22 -07:00
Robson Richards
c00c820610 Changes fireaxe to deal 24 damage instead of 25 2013-09-02 03:18:05 +01:00
Robson Richards
c76f490200 Merge branch 'master' of https://github.com/tgstation/-tg-station into 29/08/2013-TwoHanded-Weapon-Buffs 2013-09-02 03:16:40 +01:00
Aranclanos
9f1803aae4 Merge pull request #1270 from caelaislinn/terbs_weekly_fun
Terbs weekly fun #2: Laser pointers
2013-09-01 17:55:49 -07:00
Aranclanos
c96b51bf99 Merge pull request #1263 from Cheridan/Offhands
Offhand IsShield
2013-09-01 17:52:50 -07:00
Ergovisavi
9125c53028 Improvements on improvised explosives
They now have a random hidden detonation time that ranges from 3 to 8 seconds
They now can be made from any can, and will have a different appearance based on each one

-They look goofy if you try to spawn them in with admin commands (they have no soda can to reference, so the can is invisible in the sprite) but are completely functional otherwise

Modifies reagent_containers/food/drinks in order to move all canned drinks to the food/drinks/soda_cans to bunch them all up so they are easily worked into the IED

Modifies machinery/vending due to the abovementioned moving of canned drinks from food/drinks to food/drinks/soda_cans

Modifies the map because of the above to fix filepath issues

And of course adds weapons/grenades/ghettobomb.dm for the bulk of the IED, and modifies grenade.dmi for the sprites
2013-09-01 09:18:28 -07:00
MrPerson
eaf201bd1c Grammer fixes
You put the the pen into the box ( Fixes #671 )
Capitalization errors on spiders and cocoons. ( Fixes #679 )
2013-09-01 01:40:50 -07:00
Neerti
cedfa6415e Fixed a typo in the box's description, thanks Kaze. 2013-09-01 03:56:36 -04:00
Ergovisavi
9d1684b597 Add createable Improvised Explosives! 2013-08-31 22:39:45 -07:00
Neerti
d104cd1c3e Made it so instead of getting the suit or a helmet, you will receive both inside a box that looks very similar to the one you get for ordering a real suit from an uplink. 2013-09-01 01:01:53 -04:00
Cael_Aislinn
35f5fbf17e adds laser pointer, makes RD + lawyer + librarian spawn with one, makes laser pointer a steal objective
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-09-01 13:42:28 +10:00
Aranclanos
9e37b95ad6 Merge pull request #1268 from fleure/master
Added empty line between "Update PDA Info" and time
2013-08-31 09:45:41 -07:00
Cheridan
214160aac8 Merge pull request #1255 from Intigracy/WhatAGag
What a gag!
2013-08-31 08:43:40 -07:00
Fleure
cb7b0f9be1 Added empty line between "Update PDA Info" and time 2013-08-30 20:35:16 +01:00
VistaPOWA
6e83288a78 Bunch of fixes
Cleans up the resist code for lockers
Adds both locked and broken vars to closets
Fixes secure lockers opening when welded, but not locked
2013-08-30 19:59:23 +02:00
Robson Richards
5b62a22f0f Tweaks Damage Values 2013-08-30 03:55:17 +01:00
Cheridan
70966883b9 Twohanded weapon's offhand item will count as a shield if the weapon itself is a shield. 2013-08-29 21:21:10 -05:00
Robson Richards
086187ac3c Increases the damage of Two handed weapons
to give them more of an advantage over One handed ones, Suggestion and Exact damage values originally from http://www.ss13.eu/phpbb/viewtopic.php?f=10&t=1303

Balance issues and Damage value Discussion can happen here: http://www.ss13.eu/phpbb/viewtopic.php?f=12&t=1440
2013-08-29 21:58:56 +01:00
Intigracy
f7c644c9dc Adds gags!
50% chance of getting either a gag or a blindfold with the maid and nyangirl outfits in the theater

Monkeys have a sprite too.
2013-08-29 12:19:34 -07:00
VistaPOWA
94d5e5ecba Fixes attached voice analysers not listening
The voice analyser will listen to the keyword now even when not secured
(enabling it to be directly used on grenade casings and tank transfer
valves).

Adds missing related proc to tank transfer valve.
2013-08-28 01:53:26 +02:00
VistaPOWA
7393c4217d Adds critter crates
Fixed several conflicts present in last pull request, should be fine
now.

All animals ordered through cargo will arrive in critter crates. These
crates are designed for the safe transport of animals. Critter crates
can only be unlocked from the outside and automatically lock when
closed. You can resist your way out of the crates. Critter crates are
counted as normal crates when sent back to CentComm.

Adds cat crate (cost: 40 points).

Corgi crate now has a 50-50% chance of either containing a male or
female corgi.
Moves critter crate sprites from storage.dmi to closet.dmi.

Removes redundant large animal crates.
2013-08-27 22:25:42 +02:00
Cael Aislinn
7071343b81 Merge pull request #1191 from Cheridan/PDA
PDA Painter Machine
2013-08-26 07:58:37 -07:00
Cael Aislinn
53415eff7f Merge pull request #1219 from Aranclanos/WindowsAndGrillesGC
Windows and grilles garbage collet
2013-08-23 17:36:00 -07:00
Cael Aislinn
6661ce81b9 Merge pull request #1205 from dumpdavidson/emp_overhaul
EMP-kit
2013-08-23 06:57:51 -07:00
Aranclanos
69c85fa4e9 Makes windows and grilles garbage collect. This will make fires a LOT less laggy. And singularities a bit. 2013-08-23 09:42:50 -03:00
Cheridan
cc1e3d2b6d Merge pull request #1178 from caelaislinn/pugs
Adds pugs, makes pugs orderable via cargo
2013-08-22 22:52:48 -07:00
Cheridan
d44873546f Merge pull request #1183 from Tenebrosity/consistenttimeanddate
Fixed #721 - Consistent time and date
2013-08-22 22:35:16 -07:00
dumpdavidson
5b6c126a1a Adds EMP implant.
Replaced the EMP grenades from the uplink with an EMP kit.
The kit contains a grenade, an implant and a flashlight with 5 uses that can EMP any object or mob in melee range.
2013-08-21 21:48:37 +02:00
dumpdavidson
55f7f2a1d5 Adds a special flashlight that can be used five times to directly inflict strong EMP on an object or mob at close range. 2013-08-21 20:51:02 +02:00
Cheridan
43d85cc5c0 PDA Painter Machine
-Adds the PDA painter, which lets you change the appearance of the inserted PDA. Good for job-changes and possibly traitor disguises?
-Cleans up pda.dmi, moves the ai card and pai device sprites to their own .dmi. PDA box sprite moved to storage.dmi where it belongs.
2013-08-19 23:47:07 -05:00
Cael Aislinn
635454486a Merge pull request #1188 from MrPerson/waterflower
Made the clown's waterflower a child of spraybottles
2013-08-19 03:18:47 -07:00
MrPerson
60e25d2b9a Made the clown's waterflower a child of spraybottles rather than having its own snowflake spraying code. As a result, clowns can refill the flower with anything and spray a single unit of reagent at people. Pepperspray is a good one. Honk honk.
Fixed "you empty the the spray bottle" message.
2013-08-18 19:41:32 -07:00
Cheridan
bfeef72660 Merge pull request #1102 from Aranclanos/Linda
Linda.
2013-08-18 15:27:23 -07:00
Jesus Hussein Chris
51e4c0bb3f Merge branch 'master' of https://github.com/tgstation/-tg-station into time 2013-08-18 11:03:13 +12:00
Cael_Aislinn
194a98736f makes pugs orderable via cargo bay
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-08-17 10:13:08 +10:00
Jesus Hussein Chris
2756405cd2 Makes times and dates consistent. Adds date to PDA. 2013-08-17 04:19:41 +12:00