Commit Graph

7166 Commits

Author SHA1 Message Date
Cheridan 565e4dda5a Merge pull request #9931 from Jordie0608/tfwyougetsocarriedawayyoudontevenachievewhatyousetoutforandhavetomakeasecondprforit
Overlays for computers
2015-06-14 10:25:27 -05: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
Jordie0608 51106be4ec replaced icon with image 2015-06-14 17:49:45 +10:00
barackobama f00f699343 make cyborgs unable to load their inbuilt RCDs 2015-06-14 00:36:52 +01:00
barackobama e7b2c1e53b unEquip instead of drop_item 2015-06-14 00:08:32 +01:00
phil235 7adeaf0beb Explosions no longer throw anchored items. 2015-06-14 00:46:54 +02: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
duncathan 9d64ca0e0c makes the game compile
fixes more icon paths
I gave zvent the vent_map icon as a placeholder because it's not like it's even used anyway
2015-06-13 12:33:31 -06:00
barackobama a6ae5dbe47 Increase max ammo for RCD, allow RCD to be loaded
with glass, metal, and plasteel, allow RCD to build
and deconstruct grilles and windows, add three RCDs
to the Engi-Vend machine
2015-06-13 15:40:06 +01:00
xxalpha e90b472800 Fixed RCD wall deconstruction runtime. 2015-06-13 13:17:02 +01:00
Jordie0608 3e07dbc5a9 Merge branch 'master' of https://github.com/tgstation/-tg-station into mycomputerismadewithoverlayswhyisntyours
Conflicts:
	icons/obj/chemical.dmi
2015-06-13 20:23:29 +10:00
Jordie0608 752f5e883d eol conversion 2015-06-13 20:15:49 +10:00
Jordie0608 5ef93b2225 overlays for computers 2015-06-13 20:07:48 +10:00
duncathan dab13732fe cleans up icon paths; modifies certain unary devices
updates icon paths in multiple files
removed insulated icon state in pipe_item.dmi (insulateds are deaaaad)
lays an icon framework so that o2 generators, cold sinks, heat sinks may eventually be made constructable
  they no longer override update_icon() but instead update like just about every other device
  eventually I'll give these real sprites but given that they're unused it can wait for now
  sprites and construction are outside the scope of this PR
makes heat exchangers update their color based on their node
  because heat exchangers are different sprite-wise they had to override update_icon entirely
makes heat exchanger, heat sinks, cold sinks, o2 generators non-dense
2015-06-13 02:43:17 -06:00
kingofkosmos 899f2f5119 Security locker unlocks if you attack it with an empty hand. 2015-06-13 11:20:33 +03:00
Razharas 29730ce479 Merge pull request #9412 from RemieRichards/ReactionaryExplosions
Ports VG's DeityLink's new explosion method
2015-06-13 04:45:23 +03:00
Razharas b7150068cc Merge pull request #9783 from nukeop/master
Adds a chemistry bag for moving large amounts of patches/pills/bottles at once
2015-06-13 04:42:16 +03:00
Razharas 7dbd3b13da Merge pull request #9872 from xxalpha/itsalwaystrue
Fixes infinite cyborg stack usage on a couple of things.
2015-06-13 04:34:05 +03:00
Razharas 4373f6eece Merge pull request #9904 from xxalpha/runtimesrun
Fixes three runtimes.
2015-06-13 04:29:20 +03:00
Razharas ec6c0465b5 Merge pull request #9879 from Incoming5643/skeleton_man
Magic Mania 1.91: Life's a lich and then you rework the mechanic to be less terrible
2015-06-13 04:24:38 +03:00
Ikarrus 78ec879f27 - Ghosts can hear gang messages
- Gang spraycans no longer have a unique name for more stealth
2015-06-12 08:22:42 -06:00
Ikarrus d2ef043690 Resolved Conflicts:
code/modules/mob/living/living.dm
2015-06-11 23:46:59 -06:00
Incoming 595bb0c8e4 Generalizes lizard parts to "features" for future non-lizard fields, at the same time merging mutant color into this list
Random lizard bodies will finally have color!

Pushes features almost all the way to the DNA side of thing, the mob side is only needed during character creation.

Note that changes to the save file will invoke a one time per character runtime for legacy characters as the save file purges mutant_color, this is as far as I can tell harmless, has no effect on the player, and is self correcting.
2015-06-12 00:43:35 -04:00
xxalpha 9ba7e6aaf4 Fixes three runtimes.
Better fix. src. purge
2015-06-11 21:30:13 +01:00
Cheridan 7363088cbc Merge pull request #9802 from Miauw62/AyeEye
Nerfs the AI in several minor ways.
2015-06-11 14:13:52 -05:00
Cheridan 808ffb4160 Merge pull request #9902 from Miauw62/inexperience
Removes strip_html_properly(), replaces it with html_encode().
2015-06-11 10:31:53 -05:00
Remie Richards d72cb4bdf1 Merge branch 'master' of https://github.com/tgstation/-tg-station into ReactionaryExplosions
Conflicts:
	code/game/machinery/doors/poddoor.dm
	code/game/turfs/simulated/floor/plating.dm
	code/game/turfs/unsimulated/walls.dm
	code/modules/admin/admin_verbs.dm
2015-06-11 16:23:45 +01:00
Remie Richards 1800c56456 Merge pull request #9769 from Cheridan/ACTUAL_FUN_REMOVAL
Adjusts Chaplain Special Bible Equipment
2015-06-11 16:15:41 +01:00
Miauw a881478743 Removes strip_html_properly(), replaces it with html_encode().
It was not as proper as the name would imply, and experience and amused redditors have taught me that writing a proper HTML-scrubbing function is a very hard task indeed.
2015-06-11 15:37:41 +02:00
Dorsisdwarf 7afd81e083 removes loaded bag from locker, adds to uplink at discounted price. Lowers cost of least-used ammo type 2015-06-11 08:09:36 +01:00
Ikarrus 59d9098d26 Gang Update 2015-06-10 23:05:58 -06:00
Xhuis 50e49d1136 FEATURES SIX AND SEVEN: Suicide msg's and cloaks 2015-06-10 14:17:38 -04:00
Jordie0608 77b2e54de7 code improvement and overlays for fancy storage, dropper, syringe and lighter 2015-06-10 18:58:19 +10:00
Incoming 1f0097a74a Adds the bind soul spell for wizards. It turns them into a lich (skeleton) and gives them access to a long cooldown ressurection spell (starts at 3 minutes).
The ressurection spell can only be used while dead/dying and charges at all times. When used the lich gains a new body at the site of their phylactery and is stunned for a short while. Meanwhile the old wizard body crumbles to dust leaving all the wizards worldly possessions on the ground. Anyone who sees the corpse crumble will also get a cardinal direction pointing towards the wizard.

Every time the wizard dies this way, the time between ressurections is increased by a minute. To take a lich out of the game for good, either destroy the body before the lich can cast the spell again, or destory the phylactery and kill the wizard one last time.

Liches spawn with robes and spells intact, but nothing else, everything collected on their original body stays there.

As a balance issue, this spell can't be used in the den, the item must be bound after arriving at the station.

Adds a nice black wizard robe ensemble for liches.

Magic mirrors (save for a special badmin only one) can no longer skeletonize people.

Adds a hopeful mulligan fix to wizard rounds problems. Also corrects an adminlog message.
2015-06-10 03:40:14 -04:00
xxalpha ed6b1d137c Fixes infinite cyborg stack usage on a couple of things.
Kill debug msg

Better fix.

Finished better fix.

NOW FINISHED
2015-06-10 03:27:04 +01:00
Razharas b873176a77 Merge pull request #9821 from Cheridan/just_cuff_my_shit_up
REMOVES CABLE CUFFS...
2015-06-10 01:17:35 +03:00
GunHog 7ddcbb1967 Tweak and fixes
- Made the interactions into defines.
- Fixed a runtime for when an AI tries to set a DNA lock.
2015-06-09 14:45:38 -05:00
MrPerson 7c3cb399d0 Makes the game compile in byond version 508
throw is a reserved keyword so all throw() and var/throw had to be renamed.
Only compile tested because I'm fucking lazy.
2015-06-09 04:14:12 -07:00
MrPerson 9dc713ba9c Merge branch 'master' of https://github.com/tgstation/-tg-station into screen_alert_2
Conflicts:
	code/_onclick/hud/alert.dm
	code/game/objects/items.dm
	code/modules/mob/living/carbon/human/human.dm
	icons/mob/screen_alert.dmi
2015-06-09 03:23:18 -07:00
Jordie0608 1453513f03 cigarettes overlayed 2015-06-09 16:06:08 +10:00
Cheridan d7e3363129 Merge pull request #9817 from xxalpha/dropfixes
Fixed hacking from inside machines.
2015-06-08 21:27:32 -05:00
GunHog d3fbacc224 Tweaks
- Sorts out the transfer_ai() proc, it can now be added to practically
anything you wanted to give to an AI.

- Moved mech functions to the unused middle click.
2015-06-08 20:46:01 -05:00
xxalpha 13b3e0d098 Tweaked core radiation values. 2015-06-08 18:58:41 +01:00
AnturK b572db24c5 Adds AI functionality 2015-06-08 18:26:41 +02:00
AnturK 46a4d6fe8f Adds PDA-Message Photo Attachment 2015-06-08 17:40:24 +02:00
Cheridan 29c2bb474d Merge pull request #9804 from Firecage/Exwelder
Adds the experimental welder to R&D + adds some descriptions.
2015-06-07 21:23:45 -05:00
xxalpha 41feb1d911 Defined nuke state values. Tweaked core's process() and others. 2015-06-08 01:06:11 +01:00
Cheridan f81da3f13d Merge pull request #9818 from phil235/TypoJanicartFix
Fixes typo in janitorial cart message.
2015-06-07 16:50:56 -05:00