Commit Graph

758 Commits

Author SHA1 Message Date
Swag McYolosteinen
46b519309e Merge pull request #11058 from Core0verload/surgery-organs-part2
Surgery & Organs rework: Phase 2
2015-08-13 18:04:16 +02:00
Cheridan
720ffcc862 Merge pull request #11073 from RemieRichards/WireModernisation
RnD Machines + Pizza bombs now use Wire datums
2015-08-12 22:23:18 -05:00
Miauw
ad1da7c157 Removes tape recorder wires to fix a server-crashing bug. 2015-08-10 14:00:05 +02:00
Remie Richards
4870122858 Rnd machines and Pizza boxes now use real wire datums, instead of the ancient method of list+var, Because of this they now also respond to Multitool-Pulsing.
Adds GetColour(index) helper to wire datums.
2015-08-07 03:35:10 +01:00
c0
691f6fb66d Surgery & Organs Rework: Phase 2 2015-08-06 09:56:54 +03:00
c0
600d424ea5 Moved cyberimplants to internal organs system 2015-08-02 22:28:45 +03:00
Cheridan
1c05fbcf6a Merge pull request #10450 from phil235/MechRefactoring
Mech code refactor
2015-07-20 02:00:11 -05:00
WJohn
001dd150e0 Merge pull request #10655 from MMMiracles/TWANG
Adds a 'TWANG' sound effect for guitars
2015-07-19 13:34:40 -04:00
MMMiracles
ca419e47c6 adds a 'TWANG' sound effect for guitars when hitting something 2015-07-16 07:59:10 -04:00
phil235
34db8dd695 Merge branch 'master' of https://github.com/tgstation/-tg-station into MechRefactoring
Conflicts:
	code/game/mecha/equipment/mecha_equipment.dm
	code/game/mecha/equipment/tools/medical_tools.dm
	code/game/mecha/equipment/tools/tools.dm
	code/game/mecha/equipment/weapons/weapons.dm
	code/game/mecha/mecha.dm
2015-07-16 13:50:01 +02:00
Firecage
4688c2c969 Fixes proc arguments 2015-07-15 23:52:35 +02:00
phil235
359a270de6 Merge branch 'master' of https://github.com/tgstation/-tg-station into MechRefactoring
Conflicts:
	code/game/mecha/equipment/tools/medical_tools.dm
	code/game/mecha/equipment/tools/tools.dm
	code/game/mecha/mecha.dm
2015-07-14 01:20:37 +02:00
phil235
f580ad3863 Merge pull request #10492 from Miauw62/recorders
fixes tape recorder spans.
2015-07-10 22:57:42 +02:00
Miauw
38d543aee9 fixes tape recorder spans. maybe this wont cause exploits 2015-07-09 17:59:58 +02:00
MrStonedOne
a262f9aac7 Attack logging tweaks
Removed the "feature" to have something log in an atom's vv attack log, but not the file attack log. all attack log items will go to the file as well as vv.

Replaced all hard coded src.name/name for attack log's object argument with an actual object (src) except where it made more sense not to.

All attack logging *should* happen AFTER damage is applied now.

Removed the confusing attack entry for when a changeling stings another changeling.

Tweaked how punch attack logs worked
2015-07-08 23:14:37 -07:00
phil235
ea1780ce97 - Mech equipment was using its unique processing method, with specific timing for each equipment, but now it uses obj processing, I
changed the values so the equipment effect stays the same. Remove global_iterator datum.
- fiddled with equip_ready procs of mech tools.
- removed mecha/proc/do_after and /enter_after() procs.
- Renamed mech sleeper occupant var to "patient" to avoid confusion with the occupant of the mech.
- all non instant tool (drill) now show a progbar when drilling etc..
- action cooldown now use do_after_cooldown() (that itself uses do_after) and start_cooldown (for instantaneous actions).
- Removed mecha_equipment's destroy proc, it's now all in Destroy(). No confusion.
- modified mecha_equipment/proc/can_attach() to not check istype(mecha) b/c it can't not be. (so the child only have one istype check.
- Removed diamonddrill/can_attach() , all done at drill level.
- armor booster now only for combat mech, instead of all except honkmech.
- Removed dynhitby, dynbulletdamage, dynattackby, dynusepower(), dyngetcharge(), dynabsorbdamage()
- I split the tools.dm file into smaller ones: work tools, mining tools, other tools.
- I split mecha.dm into mecha.dm, mecha_topic.dm and mecha_defense.dm
- refactored mech weapon ballistic/launcher, new proj_init proc, more OOP.
- Moving consumes energy! Lights consumes energy. Fixes #9425.
- Fixed #7354 xeno not bursting if host is inside a mech.
- Added action buttons to mech. Moved toggle lights, internal tank, eject, view stats from verbs to action buttons, these can now only

be done via these buttons (removed them from the big stats window).
- Removed port connect verbs b/C it's automated now.
- regular hud is no longer hidden when inside a mech (doesn't matter b/c you can't interact with most stuff in it while in a mecha). Fixes issue 10387
- can't walk when shooting projectiles. Makes walking on your projectile a bit harder. Helps against issue 10315 (but doesn't fix it).
- also made into action buttons: the special abilities of certain combat mechs.
- Added thrown alerts for mech charge and integrity.
- Fixes teleporting occupant out not properly removing it from the mech. Fixes issue 10330
- fixes ballistic mech weapons spinning when launched. proc/throw_at() now has a spin argument instead of using var/allow_spin that was added to all atoms just for that.
- added a update_action_buttons() to ai/life() to handle ai mech.
2015-07-07 19:40:32 +02:00
Cheridan
447d7651eb Merge pull request #10299 from xxalpha/runtimesrun
Fixed T-Scanners runtime error
2015-07-04 12:44:23 -05:00
xxalpha
8e8d9157d3 Fixed runtime with t_scanners.
Now it's fixed.
2015-07-03 12:16:22 +01:00
MrStonedOne
ed9238600e Revert "Fixes overexcited TTV reporting" 2015-07-02 16:34:22 -07:00
Cheridan
b2ab5d84d1 Merge pull request #10309 from Ikarrus/holyshitsecbuffshutitdownikarrusisshit
Flashes and Flashers
2015-07-02 22:50:28 -05:00
Ikarrus
24891ba762 Reduced aoe flashes to just one tick 2015-07-02 19:05:29 -06:00
xxalpha
4a86be4883 Merge remote-tracking branch 'upstream/master' into boxesofbananium
Conflicts:
	code/game/objects/items/stacks/sheets/mineral.dm
2015-07-02 18:49:41 +01:00
Ikarrus
02a60c6e89 Flashes and Flashers 2015-06-30 22:20:20 -06:00
xxalpha
cfb5e724b6 Material container, all items can have materials, wake me up
cant wake up

go to sleep debug
2015-07-01 03:34:47 +01:00
nullquery
a6ce6abfe3 Merge pull request #8 from nullstation/master
Merge with upstream
2015-06-28 07:09:40 +02:00
NullQuery
b4248b01e4 - Crew monitoring computer using the html_interface module
- Patch: Don't update html_interface clients that have been inactive for more than 10 minutes.
- Patch: Attempt to speed up _renderContent some more (in case of multiple clients) by using spawn.
- Patch: Second argument for hiIsValidClient hook: reference to the current html_interface object (used by crew monitoring computer).
- Feature: procqueue singleton. You can use this to put proc executions on a queue. Used by the crew monitoring computer to queue the update "for the next tick" when humans move.
2015-06-27 10:26:46 +02:00
Ikarrus
6cc17a6243 Resolved Conflicts:
code/modules/clothing/clothing.dm
	code/modules/clothing/masks/gasmask.dm
	code/modules/clothing/suits/bio.dm
	code/modules/clothing/suits/utility.dm
2015-06-27 00:17:02 -06:00
Ikarrus
8759f56f6f Squashed Commits 2015-06-27 00:09:16 -06:00
phil235
2e61607d3f Merge pull request #10105 from xxalpha/chief
Cleaned some clothing flags.
2015-06-26 19:03:13 +02:00
Cheridan
7568861a57 Merge pull request #10102 from xxalpha/chef
Fixed being able to interact with electropack while wearing it.
2015-06-24 10:07:45 -05:00
xxalpha
d18a98864a Remove optimization code. 2015-06-24 01:14:20 +01:00
Iamgoofball
a8ec1c76df Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics
Conflicts:
	code/ATMOSPHERICS/atmospherics.dm
	code/game/machinery/computer/computer.dm
	code/game/objects/items/weapons/explosives.dm
	code/game/objects/structures/crates_lockers/closets/fireaxe.dm
	code/game/objects/structures/musician.dm
	code/game/objects/structures/tables_racks.dm
	code/game/objects/structures/window.dm
2015-06-23 12:54:26 -07:00
xxalpha
16504ef0cf Cleaned some clothing flags. Ported turf/Entered optimization from vg. 2015-06-23 01:52:14 +01:00
xxalpha
0d6ac5c30c Fixed being able to interact with electropack while wearing it. 2015-06-22 23:16:22 +01:00
Razharas
e6b738734a Merge pull request #8876 from xxalpha/fixfixfix
Cyber Implants + (Pt.2)
2015-06-21 22:12:17 +03:00
Remie Richards
c79963f7b7 Merge pull request #9792 from GunHog/AI_STOLE_MY_BIKE
Malf AI module changes + Mechs for normal AIs!
2015-06-21 00:30:03 +01:00
Cheridan
a2948ba203 Merge pull request #9956 from Jordie0608/whocodesthecodemen
Various admin improvements
2015-06-20 00:53:30 -05:00
Xhuis
bc7d1ab93d Changes the way the airlock charge works 2015-06-19 14:46:06 -04:00
Xhuis
e1356f889e Merge remote-tracking branch 'remotes/upstream/master' into thaw 2015-06-18 23:37:06 -04:00
phil235
e6dcabf245 Merge pull request #9960 from xxalpha/bass
Put drop_item() calls inside ifs. Replaced some drop_item() with unEq…
2015-06-18 15:50:35 +02:00
phil235
98c158f958 Merge pull request #9845 from AnturK/buttsender
Adds PDA-Message Photo Attachment
2015-06-17 20:36:52 +02:00
Xhuis
3bc466a0ff Merge remote-tracking branch 'remotes/upstream/master' into thaw 2015-06-16 11:42:47 -04:00
Jordie0608
0bf6f09969 Merge branch 'master' of https://github.com/tgstation/-tg-station into whocodesthecodemen
Conflicts:
	code/modules/admin/verbs/pray.dm
2015-06-16 17:24:20 +10:00
GunHog
fd27d9d3bb Merge remote-tracking branch 'remotes/upstream/master' into AI_STOLE_MY_BIKE
Conflicts:
	code/game/gamemodes/malfunction/Malf_Modules.dm
2015-06-15 12:26:28 -05:00
GunHog
bc11259282 Merge remote-tracking branch 'remotes/upstream/master' into AI_STOLE_MY_BIKE
Conflicts:
	code/game/machinery/computer/aifixer.dm
2015-06-15 11:27:11 -05:00
xxalpha
b2e84a0d3c Put drop_item() calls inside ifs. Replaced some drop_item() with unEquip( 2015-06-14 20:11:40 +01:00
Jordie0608
a67de221cc JMP replaced with FLW, fixes and adds a bunch of key_name checks in adminlogging 2015-06-14 23:37:35 +10:00
kingofkosmos
c8d79e7034 Removed unnecessary spaces in these situations:
"span class = '" changed to "span class='"
"'> " changed to "'>"
2015-06-14 12:13:19 +03:00
Iamgoofball
4de75c539f Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics
Conflicts:
	code/game/objects/structures/crates_lockers/closets.dm
	code/game/objects/structures/table_frames.dm
	code/game/objects/structures/windoor_assembly.dm
2015-06-13 14:20:17 -07:00
Iamgoofball
c2256d41fc BAR NOW SHOWS UP ON THE OBJECT YOU'RE INTERACTING WITH 2015-06-13 13:58:08 -07:00