Commit Graph

271 Commits

Author SHA1 Message Date
Rockdtben
6eeeb1e5fe Removed some useless comments from years ago. 2014-03-12 07:59:34 -05:00
Ergovisavi
a3ce04c000 Merge branch 'master' of https://github.com/tgstation/-tg-station into stamina_loss
Item attack changes
2014-03-06 03:17:02 -08:00
MrSnapwalk
789134d8f2 Automerge fix
Fixing the conflicts preventing an automerge.
2014-03-02 17:03:35 -06:00
Razharas
6b14c42c41 Merge pull request #2898 from ChuckTheSheep/TC-Green-Text
TC use count appears on round end
2014-03-02 13:02:28 -08:00
MrSnapwalk
34931dc227 Item sprites!
Adds generic item sprites to all items added.
2014-03-01 20:19:32 -06:00
Ergovisavi
ac269baacb Fixes bullet_act not checking for damagetype on many, many objects.
Replaces Holodamage with Stamina damage, if your stamina damage exceeds your current health, you get weaken(5)'d. Stamina heals itself slowly over time.
Makes the hallucination enemies deal more stamina damage than they did holodamage, but stamina damage heals now so it's mostly for just seeming threatening at the moment.
Adds the Disabler, a gun that does stamina damage. It has a range of your screen, but no more. Adds a disabler crate to cargo (security lock)
Fixes Lasertag ED209's because they were busted as shit
Reduces ED209's view range to 9 from 12, which was several times longer than your screen view, now is only a little bit more
Lastertag now does stamina damage instead of an instant stun for that GRITTY LASERTAG EXPERIENCE
2014-03-01 16:39:22 -08:00
MrSnapwalk
39c155c03a Classy Outfits
Adds formal uniforms, a black tango dress, and a professional black suit
(with added Memorizer for maximum CIA spookyness). To do: make this
stuff orderable from cargo, and add some of it to the lawyer's closet.
2014-03-01 00:30:05 -06:00
hornygranny
c31647376e This is for discussion of things that need to be changed to move away from purely stun based combat. Please only comment if you have something to contribute, rather than just saying you like or dislike it.
Shoes do not increase your movement speed
Stun/weaken on basically everything reduced from 10+ to 5 ticks
Time to unbuckle/uncuff self halved
2014-02-27 10:56:06 -08:00
ChuckTheSheep
21d621c049 Merge remote-tracking branch 'upstream/master' into TC-Green-Text 2014-02-25 20:19:32 -05:00
ChuckTheSheep
6cc3055714 Uses compiled list for uplinks 2014-02-25 17:53:30 -05:00
ChuckTheSheep
0d1bcfb336 Moved images to top "survived" line 2014-02-24 11:14:08 -05:00
ChuckTheSheep
82cfa679b4 Made Purchase Log Text rather than List 2014-02-24 04:01:38 -05:00
ChuckTheSheep
6ecb511a24 TC use count appears on round end 2014-02-23 23:43:45 -05:00
Hornygranny
0d648c6d8a no more headaches 2014-02-21 01:20:46 -08:00
Razharas
e299b62400 Merge pull request #2817 from Sugarette/spellcheck
Spell check of origin_tech variables in items that no one deconstructs anyway
2014-02-20 16:25:57 -08:00
Razharas
5a8eed4c32 Merge pull request #2824 from hornygranny/throw_range
throw_range pass
2014-02-18 16:17:13 -08:00
Sugarette
b48583a587 Merge pull request #3 from Sugarette/master
Wonder if it works
2014-02-18 22:07:56 +03:00
Miauw
3b24bb64f4 Merge branch 'master' of https://github.com/tgstation/-tg-station into NODROP
Conflicts:
	code/modules/mob/transform_procs.dm
2014-02-18 18:22:40 +01:00
Hornygranny
2134add41b Items with throw_range over 7 reduced to throw_range 7. This does not affect players as there's no way to extend your vision range. 2014-02-17 15:44:07 -08:00
Sugarette
2286d6dc61 Merged two lines with origin_tech
One used to overwrite the other.
2014-02-17 10:44:00 +03:00
Hornygranny
9d3f8f6a2d second pass 2014-02-15 20:11:12 -08:00
Hornygranny
9e14c22747 Reduces throwspeeds on all items to realistic levels. 2014-02-15 19:58:03 -08:00
Miauw
3f9bf15ca5 Merge branch 'master' of https://github.com/tgstation/-tg-station into NODROP
Conflicts:
	code/modules/mob/mob.dm
2014-02-15 17:30:21 +01:00
Miauw
0328f437ff finishes up nodrop as far as i can be arsed to 2014-02-15 16:22:25 +01:00
hornygranny
e0d0cedf36 passed over everything with throwforce 2014-02-13 18:06:50 -08:00
Miauw
9b8656247c u_equip is now called unEquip PANIC 2014-02-13 20:58:33 +01:00
hornygranny
9f46d5d8f7 Accounted for ridiculous edge case 2014-02-12 14:33:27 -08:00
hornygranny
46f8911f45 transfer valves now dynamically update their w_class based on attached tanks 2014-02-12 14:23:34 -08:00
Miauw
8c7ef19be6 Replaced before_take_item() and drop_from_inventory() with u_equip 2014-02-12 19:51:37 +01:00
hornygranny
d47a9a4010 Fixes https://github.com/tgstation/-tg-station/issues/2720 2014-02-12 10:48:49 -08:00
YotaXP
6db2c59772 Reduced the potency of carrying multiple light sources. 2014-02-05 16:54:46 -05:00
Malkevin
a1c4c4bbd7 Merge branch 'master' of https://github.com/tgstation/-tg-station into bugfixes
Conflicts:
	code/modules/mob/mob.dm
2014-01-26 19:22:33 +00:00
JJRcop
0e45022798 Resolved more conflicts with drying rack before being pulled
Conflicts:
	code/modules/hydroponics/seeds.dm
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/obj/hydroponics.dmi
Readded missing file changes to icons/obj/harvest.dmi
2014-01-21 13:01:53 -05:00
fleure
d6964e703d Merge pull request #2442 from Alek2ander/master
Logs, logs everywhere
2014-01-20 11:08:57 -08:00
Cheridan
70e5618cb0 Merge pull request #2375 from Giacom/remove_icon_operations_from_premises
[501] Refactored the code to remove most icon operations for changing an icon's colour.
2014-01-19 16:06:25 -08:00
Alek2ander
9fa38637ad Logs everywhere
Explosion game log now has epicenter coords
Powersink placement and explosion notifications
C4 notifications and logs
Logging singulo munchies and death
All SMES interactions now logged, because any of them can mess stuff up
Telesci logs what was teleported
2014-01-19 21:16:30 +04:00
Rolan7
f5267c22db Fixes Issue 112 which was due to powersinks draining cells without telling the APC, resulting in the APC believing itself to be full. 2014-01-17 17:21:38 -05:00
Giacomand
aceb4b22e1 Removed the icon color blend operations from human's update_icons().
Changed all the hair/facial_hair/eye sprites to use a white base.
Changed the preview screen, in the preference menu, to use ICON_MULTIPLY to be able to use the new white sprites.
Removed the unused and broken cloaking item.
Ninjas now use the alpha variable, removed most of the checks for it.
Updated the documentation a bit.
Added some helper procs for later.
2014-01-16 14:33:50 +00:00
JJRcop
4404d2462e Fixing conflicts
Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
2014-01-15 09:37:17 -05: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
646df06cf9 moved when the emp_act is called in the afteratack proc of the emp flashlight
using absolute paths everywhere now.
adds a backslash to prevent "The the flashlight..."
2014-01-11 21:40:15 +01: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
Malkevin
a8c153a290 A bunch of bug fixes
-fixed space ninjas not being able to charge directly from power cells - fixes #2139

-'fixed' Distro/Waste Monitors not displaying pressure read out when sensor was reading zero pressure - fixes #
227

-removed the canmove check on camera consoles - fixes #490

-Fixed stealmin's real ckeys showing in the admin-pm reply dialog's title - partially fixes #2163

-Fixed people buckled to chairs not dropping their items when appropriate (like when dead) - fixes #2172

-Fixed people being able to use uplink functions whilst stunned/dead/etc - fixes #2144
2014-01-11 18:37:31 +00: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
0afe5c982d merging upstream master into local repo 2014-01-11 17:14:48 +01:00
Giacom
c1d228a96e Merge pull request #2282 from Cheridan/Magic
Upgradeable Laser Pointers!
2014-01-11 06:09:19 -08:00
Cheridan
c10d9b2611 fixing my fixes 2014-01-10 14:10:30 -06:00
Cheridan
397b2f07e8 fixes 2014-01-08 10:42:12 -06: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