Commit Graph

781 Commits

Author SHA1 Message Date
Mercenaryblue
1d55017853 Update supplypacks.dm
Added an extra kit to the supply crate.
2014-02-04 21:50:54 -05:00
Mercenaryblue
e2293f5de6 Update supplypacks.dm
Renamed crate.
2014-02-04 09:00:45 -05:00
Mercenaryblue
2d3c91af83 Update supplypacks.dm
Adds a lasertag crate
2014-02-03 22:53:06 -05:00
metaglog
08277fe851 Prevents the airlock deny animation when the airlock is open (eg. when pulsing
the ID wire of an emagged airlock).
2014-01-31 06:55:27 +01:00
fleure
7009c447f1 Merge pull request #2393 from Balrog-was-here/inb4gambittraitor
[MAP] Syndicate playing cards and deck style support for playing cards
2014-01-26 12:19:11 -08:00
fleure
484b31ccea Merge pull request #2457 from Giacom/dart_fix
Fixes #2456 and new Add Reagent varedit option.
2014-01-26 11:06:46 -08:00
Balrog
461415430e Merge remote-tracking branch 'origin/master' into inb4gambittraitor
Conflicts:
	icons/obj/toy.dmi
2014-01-26 14:02:35 -05:00
Giacomand
4b51e6d386 Merge branch 'master' of https://github.com/tgstation/-tg-station into pr/2371 2014-01-22 20:01:11 +00:00
Giacomand
6a497b98ad Added the SetEmagged proc, for cyborgs, and replaced code to use it.
Added get_inactive_modules and get_usable_modules procs to use while looping through the cyborg's modules.
The cyborg's storage screen will now shrink if there is an empty row.
Added a new on_emag proc for modules, which is called when the module is emagged. Miner borgs use it to replace their borg drill for a diamond one.
Fixes a runtime where there is no client to update the hud.
Fixes a bug where if you emag a cyborg with no module and when they choose a miner they do not receive their diamond drill.
2014-01-22 20:00:39 +00:00
Giacomand
1256500ca2 Fixes #2456 by moving the code which transfers the reagents to ready_proj()
Removed excluded obsolete files.
Adds a new option to view variables which allows you to add reagents, useful for debugging reagents.
2014-01-20 14:20:54 +00:00
lokxy
12998c0641 Fixes issue #1828 (Wizard Perma-Mutate)
Fixes Issue #1828 (Wizard Perma-Mutate)
- added centcomm check
2014-01-19 03:13:17 +01:00
Balrog
fe8dba3dc1 Refactored card code to remove copypasted variable assignment. Card objects are now children of /obj/item/toy/cards. 2014-01-18 20:14:21 -05:00
Balrog
574e240649 Merge remote-tracking branch 'origin/master' into inb4gambittraitor 2014-01-16 16:21:46 -05:00
Miauw
6704a9948d Merge branch 'master' of https://github.com/tgstation/-tg-station into dalawisfluid 2014-01-16 19:46:04 +01:00
Balrog
5a6f29b3d5 Added syndicate playing cards. As a consequence card code now supports multiple deck styles. 2014-01-14 20:24:53 -05:00
fleure
84ee1ca8b1 Merge pull request #2314 from Giacom/toxin_filter
Symptom Fixes.
2014-01-13 13:20:29 -08:00
Cheridan
0b2a1b7ac4 Merge pull request #2323 from dumpdavidson/empkit_balance
Balance changes to the EMP kit
2014-01-12 13:09:56 -08:00
Giacom
6dc7736933 Merge pull request #2244 from VistaPOWA/syndieborgs
[MAP] Adds Syndicate Borgs
2014-01-12 05:30:22 -08:00
dumpdavidson
cf672d2c29 Balance changes to the EMP kit:
- EMP-Flashlight now has one charge less but recharges (slower than lasers/energy crossbows do)
- EMP-Flashlight description no longer reveals the nature of the device
- EMP implant now has two uses
- EMP kit now contains two grenades
- EMP and adrenaline implants now inform the user how many charges they contain to begin with (freedom doesn't because it's intentionally random)

- Fixes EMP flashlight sometimes going down to -1 charges.
2014-01-11 21:04:35 +01:00
Giacom
c8120da49c Merge pull request #2283 from YotaXP/list2text-refactor
Optimized and refactored list2text, text2list, and replacetext.
2014-01-11 10:11:13 -08:00
VistaPOWA
17095d3430 Adds additional check to syndieborg teleporter spawning, removes a redundant proc 2014-01-11 17:44:53 +01:00
VistaPOWA
0afe5c982d merging upstream master into local repo 2014-01-11 17:14:48 +01:00
Aranclanos
2417d19141 Merge pull request #2299 from Giacom/damage_convert_fix
Fixes toxic compensation giving you toxins while at full health.
2014-01-11 08:08:37 -08:00
Giacomand
26d7a263bf Merge branch 'master' of https://github.com/tgstation/-tg-station into pr/2251 2014-01-11 14:06:36 +00:00
Giacomand
1a41abc609 The wire dialog will now properly close.
Refactored some of the code into procs.
Small feature: bombs tick louder when they are 10 seconds or less left, nuclear bombs were given the same treatment but with 20 seconds.
Fixed a bug with the syndicate bomb wire datum not using the CanUse().
2014-01-11 14:05:51 +00:00
Giacomand
21a21f9ecc Third time's the charm.
Self-respiration will now properly keep you from dying of oxygen loss.
Stimulant's activation chance was increased so you had a constant flow of hyperzine.
2014-01-11 12:01:13 +00:00
Giacomand
3a026b3f4d Fixes toxic compensation giving you toxins while at full health. 2014-01-10 13:44:57 +00:00
Aranclanos
a27d85934e Merge pull request #2278 from Giacom/toxin_filter
Fixed a bug with the toxin filter.
2014-01-10 01:05:31 -08:00
Giacom
bc42827194 Typo fix. 2014-01-08 17:55:32 +00:00
Giacom
f89673ae18 Made self-respiration use dexalin instead. 2014-01-08 13:15:06 +00:00
YotaXP
f98a57b750 Optimized and refactored list2text, text2list, and replacetext.
Also fixed some grammar in the station blueprint code.
2014-01-07 22:15:25 -05:00
Incoming
7418700cce Adds a badmin bomb that lets you var edit the explosion (for pure firebombs and stupid huge explosions [remember to toggle the bombcap first])
Changes how wire shuffling works to cut down on abandoned wires.

Removes a rogue processing_objects I missed before
2014-01-07 20:50:25 -05:00
Giacom
c270e177a8 Correctly set the values so there's no chance for underhealing
Apparently damage_converter converts 6 or 12 damage, plus the randomness of the symptoms makes it hard to predict.
2014-01-07 21:35:23 +00:00
Giacom
8ba1d2c033 Fixed a flaw with the toxin filter.
Increased the amount of damage the toxin filter heals to be able to keep up with the damage converter symptom.
2014-01-07 21:27:25 +00:00
Miauw
67e37bd449 Merge branch 'master' of https://github.com/tgstation/-tg-station into dalawisfluid
Conflicts:
	code/game/objects/items/weapons/AI_modules.dm
	code/modules/research/designs.dm
	maps/tgstation.2.1.2.dmm
2014-01-07 18:18:59 +01:00
Cheridan
0102191bbc Merge pull request #2247 from Giacom/blinkyoself
Changed blink to only spawn a single static smoke cloud.
2014-01-07 08:28:06 -08:00
Cheridan
fbeeae0a4c Merge pull request #2230 from Intigracy/Redbuttonisshittysoisdoubleagent
Big red button / syndicate bomb changes
2014-01-06 18:23:07 -08:00
Cheridan
cf0d70c767 Merge pull request #2237 from Jordie0608/ispentareallylongtimeonthis
Fixed justicebot
2014-01-06 14:12:26 -08:00
Cheridan
49da9996ef Merge pull request #2228 from Incoming5643/LOGDEMSPELLS
[Maniac Mansion] Adds attack logging to learning spells from one time use spellbooks
2014-01-06 13:40:04 -08:00
VistaPOWA
fe410178fb Gives Razharas' icon to the syndieborg
Adds the crowbar and flash module to the syndieborg loadout
Changes the TC_cost variable of the teleporter to update with the
uplink_items TC_cost (thanks for the help Giacom).
2014-01-06 18:32:38 +01:00
Incoming
e3cf67ee72 Adds New Bomb/Bomb Cores + A BIG bomb bugfix
Adds a training bomb that doesn't explode but rather lets you know it would have exploded. Upon detonation or defusal it will give you your current score and rescramble the wires for another go. It should probably be added to the map somewhere in a pull that follows this.

Adds a badmin bomb that lets you summon in a number of whatever you want with var editing, it defaults to a single cookie.

Adds a specially skinned badmin clown bomb that summons in a 100 clowns by default. It honks!

Fixes a HUGE bug where, thanks to machinery automatically adding themselves to processing, bombs were ticking down two seconds at a time. This does mean that all bombs are now "nerfed" to twice the time it took before. Whether this is a good thing or should result in the timer going "back" to 30 seconds to keep the timing consistant is an open quesion.
2014-01-05 20:23:38 -05:00
VistaPOWA
eb00590d7a reorganized the code a bit 2014-01-05 23:47:44 +01:00
Giacomand
3fbeebfb6e Changed blink to only spawn a single static smoke cloud.
Fixed blink not triggering the AI turrets.
2014-01-05 20:41:06 +00:00
VistaPOWA
74f2edcb56 Makes the borg spawner and the contract a subtype of antag_spawner 2014-01-05 21:32:43 +01:00
VistaPOWA
cc553c23f4 Increases the cost of Syndicate Cyborgs
Now it's 25 TC.
2014-01-05 14:51:04 +01:00
Cheridan
bf9fa21ddc Merge pull request #2149 from Miauw62/kittens
Kittens!!!! !!! !! !! !!!!!! !
2014-01-04 20:21:15 -08:00
Cheridan
db67b90968 Merge pull request #2218 from Incoming5643/bombrefactor
Refactors syndicate bombs to remove the var degutted
2014-01-04 19:44:25 -08:00
VistaPOWA
68afbbcc18 move along people, nothing to see here 2014-01-05 03:35:17 +01:00
VistaPOWA
fd34cea8ef fixes the merging failure
hopefully that's it
2014-01-05 03:32:10 +01:00
VistaPOWA
443d6e2d9e [MAP] Adds Syndicate Borgs
Nuclear Operatives can now order a Syndicate Borg for 20TC. After
spawned, a candidate from ghosts is chosen to control it.
It has a 25k cell and the following modules:
-Emag
-Esword
-Ebow
-Laser Rifle
-Jetpack

All weapons use 100 charge per shot.

2 borg rechargers have been added to the Syndicate Shuttle for the
Syndieborgs to use.
Changelog will be added in a separate commit.
2014-01-05 03:13:40 +01:00