Commit Graph

340 Commits

Author SHA1 Message Date
Alex
53d9aca271 Merge pull request #4371 from paprka/bowmanheadsets
Bowman radio headsets
2014-08-11 14:13:26 +01:00
Firecage
24b18fad93 Absolute paths for item files. 2014-08-07 23:02:43 +02:00
paprka
e901f9b6c1 bowmans 2014-08-07 12:30:14 -07:00
MrPerson
5b0aba0e67 Merge pull request #4262 from kyrahabattoir/ItemNameFixing07-2014
Another lowercasing pass on a bunch of items and furnitures.
2014-08-02 18:02:50 -07:00
Cheridan
c74601646a Merge pull request #4287 from AndroidSFV/taperecorderfix
Fixes a minor span class in tape recorder
2014-07-31 22:28:27 -05:00
KyrahAbattoir
1b2c95a81c Merge branch 'master' into ItemNameFixing07-2014 2014-07-31 18:54:38 +02:00
Alex
589d38660a Merge pull request #3967 from CollenN/radscanner
Adds Radioactive Microlaser to Traitor Arsenal
2014-07-30 10:13:10 +01:00
AndroidSFV
99e7957db0 Fixes a minor span class in tape recorder 2014-07-29 14:59:51 -05:00
KyrahAbattoir
fcb2fb9de3 Another lowercasing pass on a bunch of items and furnitures.
Synthflesh should be a plural.
Leg cuffs is better than legcuffs.
LaserTag -> laser tag is not a brand name.
centcom -> Centcom is always capitalised.
2014-07-27 19:14:40 +02:00
Rockdtben
0e26850893 PDA - Security Records were missing tables.
Fixed a bug where printing would stop working if a record was deleted.
2014-07-12 20:54:47 -05:00
paprka
7a853c5f86 round 2 2014-07-10 20:24:49 -07:00
paprka
b92397a2e3 paprikkas gay 2014-07-10 20:12:24 -07:00
CollenN
7b90557dea ..() 2014-07-07 13:46:59 -04:00
Ben G.
d497387355 Merge pull request #4048 from Kelenius/OfAIAndHUD
Gives the AI a simple hud
2014-07-06 12:58:13 -05:00
Kelenius
e9d2124220 usr -> user 2014-07-06 21:33:05 +04:00
CollenN
92cd196731 Stuff 2 2014-07-06 08:54:07 -04:00
CollenN
ae0be09cba Stuff
Stuff: The Commit: The Update
2014-07-05 22:53:19 -04:00
Kelenius
d8ae776f64 Gives the AI a hud 2014-07-03 18:52:11 +04:00
CollenN
734558f7cc Removes reagent check
I've been somewhat busy recently.
2014-06-30 17:01:29 -04:00
MrPerson
1494b8062f Makes the spare PDA box on the bridge not invisible 2014-06-22 16:21:42 -07:00
CollenN
36261f94c8 return 1 2014-06-21 15:40:16 -04:00
CollenN
5913913c45 Fixes scan message
Now it uses the right color and punctuation
2014-06-21 15:26:16 -04:00
CollenN
c2dacb8d1f Balancing
Tweaks the cooldown numbers, as well as the wavelength calculations.

Anti-toxin, hyronalin, and arithrazine all reduce the effects of the
radiation now.
2014-06-21 14:30:49 -04:00
Cheridan
f786a6c2c0 Merge pull request #3959 from CollenN/mutrace-final
Finalizes Mutantrace Datum Update
2014-06-20 21:47:54 -05:00
CollenN
d50c2b9ec9 Adds Radioactive Microlaser
Adds the radioactive microlaser, a device disguised as a health analyzer
used to irradiate people, as a traitor item. It costs 4 telecrystals to
purchase, and is fairly powerful in clever hands.

The strength of the radiation is determined by the 'intensity' setting,
while the delay between the scan and the irradiation kicking in is
determined by the wavelength.

Each scan will cause the microlaser to have a brief cooldown period.
Higher intensity will increase the cooldown, while higher wavelength
will decrease it.

Wavelength is also slightly increased by the intensity as well.
2014-06-20 20:58:14 -04:00
CollenN
2aab5fa71c Finalizes Mutantrace Datum Update
https://github.com/tgstation/-tg-station/pull/3609

Squashes the commits from the above pull request. Should hopefully be a
lot less cluttered.
2014-06-19 17:42:14 -04:00
Kelenius
a8b7588c12 Merge branch 'master' of https://github.com/tgstation/-tg-station into Temp
Conflicts:
	code/game/objects/items/weapons/grenades/ghettobomb.dm
	code/game/objects/structures/door_assembly.dm
2014-06-19 02:27:10 +04:00
Alex
a3a0ede3a0 Merge pull request #3922 from phil235/BlindHealthScanFix
Scanners messages fix
2014-06-16 10:43:50 +01:00
phil235
c84f26a96d Scanners messages fix 2014-06-13 22:36:36 +02:00
Alex
4c627b956c Merge pull request #3760 from Ikarrus/bomblogging
Improved bomb logging for admins
2014-06-11 11:42:16 +01:00
Kelenius
3908160998 One big update for stacks. 2014-06-10 20:36:08 +04:00
Menshin
6749f21042 Tweaked the power distribution handling :
* the power is correctly handled each tick instead of 1 tick on 2, because of bad reinitalization,
* apcs now draw power as others machines and fixed the amount of power send to them

Partially fixes #3761.
2014-05-25 00:54:41 +02:00
ikarrus
e1998e621b Improved bomb logging
-Logging added for activating timers attached to transfer valves
-A quick link to the Signallers list has been added to bomb logs involving signallers
2014-05-19 22:25:10 -06:00
Kelenius
584a014a12 Hopefully last change 2014-05-18 22:46:32 +04:00
Kelenius
a576cb7fea Part 2 2014-05-18 21:42:20 +04:00
Kelenius
1d4a6c5d26 Merge branch 'master' into slimes
Conflicts:
	code/modules/mob/living/carbon/metroid/metroid.dm
2014-05-18 21:38:25 +04:00
Kelenius
ed5f8a0ee6 Fixes, part 1 2014-05-18 21:27:40 +04:00
Razharas
282a5d3a2b Merge pull request #3379 from Cheridan/sliceofpai
Refactors pAI law code...
2014-05-05 07:33:17 -07:00
Kelenius
3f1574a475 Added slime scanner
Much less nutrition consumed, but they actually use it to grow
Made mutation chance random between 25 and 35
Slime core reactions use 1 unit of reagent
Code cleanups
2014-05-01 14:51:26 +04:00
Cheridan
67fa027afb Missed a message! 2014-04-10 15:39:28 -05:00
Cheridan
31cfe0ba80 Merge pull request #3378 from Donkie/jobrefactor
Jobcode refactoring TAKE TWO
2014-04-09 13:52:37 -05:00
Cheridan
2b64683a6b Refactors pAI law code to use the inherited laws datum instead of its own specific variables
Removes annoying double-message box when selecting NEVER FOR THIS ROUND.
Span classes
2014-04-09 12:38:22 -05:00
Daniel
6c668c7c7b Generalised PDA naming 2014-04-09 18:43:29 +02:00
MrPerson
dd8891ef35 Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel_tweaks_3-31-14
Conflicts:
	code/game/machinery/camera/camera.dm
2014-04-08 04:53:05 -07:00
Miauw62
47c463d0b2 Merge pull request #3276 from MrPerson/play_me_a_song_piano_man
Make violin stop cutting off other sounds
2014-04-03 20:26:58 +02:00
Giacomand
e8d7526a0c Merge branch 'master' of https://github.com/Giacom/-tg-station into sec_maglite 2014-04-02 17:11:52 +01:00
fleure
400971d32b Merge pull request #3250 from MrStonedOne/powersink-admin-spam-fix
Fix for #3249 (Powersink is about to explode spam)
2014-04-02 15:53:43 +01:00
MrPerson
19d00b96f0 Make violin stop cutting off other sounds 2014-04-02 05:23:00 -07:00
MrStonedOne
6553980059 Fixes admin message spam, should only warn the admins once.
Fix for #3143
2014-03-31 14:42:47 -07:00
MrPerson
2991dd72c9 More qdel() changes.
Move all atom/Destroy() behavior to atom/movable/Destroy() so turf/areas that get qdel()'d just get del()'d like they're supposed to. Also do tag = null, which should make more things GC.
Make cameras GC correctly and some misc grammar fixes.
Make smoke grenades GC.
Tell camera bugs to del() because I'm not working on complex behavior for one item.
2014-03-31 01:11:37 -07:00