Commit Graph

1698 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
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
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 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
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
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
Xhuis 50e49d1136 FEATURES SIX AND SEVEN: Suicide msg's and cloaks 2015-06-10 14:17:38 -04: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
Cheridan f81da3f13d Merge pull request #9818 from phil235/TypoJanicartFix
Fixes typo in janitorial cart message.
2015-06-07 16:50:56 -05:00
Razharas 0e28326097 Merge pull request #9779 from Cheridan/touching_linda
Pressure_resistance Tweaks
2015-06-07 04:57:52 +03:00
phil235 24463314f9 Fixes typo in janitorial cart message. 2015-06-06 13:30:20 +02:00
phil235 ccd4137a9d Merge pull request #8974 from kingofkosmos/mopbucket
Mopping with just a bucket
2015-06-06 13:18:07 +02:00
Dorsisdwarf fc88bce4b6 sets default shotgun ammo to slugs, makes syndicate ammo bag actually have ammo in it 2015-06-05 14:05:32 +01:00
barackobama 1443ee1c75 add icon for chemistry bag
add two chemistry bags to the chemistry closet
add an option to make a chemistry bag to the biogenerator for 200 points
2015-06-04 19:17:44 +01:00
Cheridan 6c12887367 Pressure_resistance Tweaks
-Adjusts pressure resistance, which determines how easily things can get pushed around by atmos.
-Most items (handheld stuff) are less resistant, while most larger items (mobs, structures, machinery) are more resistant.
-Removes the cooldown on air pushing stuff, which should make it feel more 'responsive', as opposed to the current push->pause->push->pause effect it does now.
-MAGBOOTS/NOSLIPS NOW PREVENT SPACEWIND PUSHING! !!!
-Adds a little wooshy breeze sound to when you would get pushed
2015-06-03 23:22:25 -05:00
Cheridan 2d998452db Merge pull request #9715 from Firecage/datumspaths
Changes alot of datum/ to /datum/, also includes other path types such as /obj/
2015-06-02 23:04:51 -05:00
Jordie bd0f38f1bc Merge pull request #9535 from RemieRichards/IBetYouDontEvenUnderstandSmoothwalls
Ports /vg/s Smoothwall code
2015-06-02 16:31:42 +10:00
Cheridan 5cfb18a18d Merge pull request #9558 from Firecage/spacewind_immune_vaccine
Makes the Janicart, Roller bed, and office Chair not 'immune' to spacewind.
2015-05-31 15:19:45 -05:00
Firecage f79e0fc1aa Updates more paths, for example obj/stuff to /obj/stuff 2015-05-31 17:48:33 +02:00
Firecage bba300933a Moves the 5 pressure resistance to the base type. 2015-05-30 23:33:44 +02:00
Jordie0608 6b524f09a9 eol fixes (probably) and examine fix in closets 2015-05-28 20:48:47 +10:00
Jordie0608 b310811fdd reverts removing protectstation and clearing zeroth law 2015-05-28 19:13:30 +10:00
Jordie0608 e82c02744e paerbin clickdown, removed protectstation, rounded ui chem/plasma count, non-mob hivebot beacon 2015-05-27 16:54:13 +10:00
Cheridan 053e26c221 Merge pull request #9454 from spasticVerbalizer/heatproofAirlocks
Un-snowflakes heat-proofing glass airlocks, fixes #9437
2015-05-24 21:22:50 -05:00
Incoming fd17e5fd57 Fixes a critical bug where clicking on a closed closet that can't be opened (welded most likely) would lead to an infinite loop of attacking attackby and attack_hand until the mob pulled away from the closet. Eating too many of these errors causes the server to cry for mercy and shut down. Meaning of course that EVERY PLAYER IN THE GAME WHO READS THIS PULL CAN NOW CRASH THE GAME AT THIER LEISURE.
So yeah merge quick please.
2015-05-20 23:00:28 -04:00
Firecage 3cd212502f Makes the Janicart, Roller bed, and office Chair not 'immune' to spacewind. 2015-05-18 23:35:19 +02:00
kingofkosmos 494403969e Alt-click-toggles now do proper checks
Such as if you're near the thing, conscious, alive etc.

Fixes #9238
2015-05-18 20:22:04 +03:00
Remie Richards cf536a9c16 Ports /vg/s Smoothwall code, Angry all caps comments from N3X15 included. 2015-05-16 21:05:18 +01:00
Aranclanos 965ebdaed8 Fixes range targets changing icons
Fixes issue #129
Removed the unused /datum/bullethole
Removed some copypaste code inbetween the targets and the target stakes
Made these objects not search for eachother in the nearby turfs, they both link to eachother now
Added removeOverlays() and nullPinnedLoc() procs for /obj/item/target
Added removeTarget() and nullPinnedTarget() procs for /obj/structure/target_stake
Added a huge list of additions to the commit log that nobody will read
Cleaned up the code for both objects (target and target stakes)
2015-05-14 03:30:32 -03:00
Cheridan ba20b8a265 Merge pull request #9352 from Jordie0608/redefiningwhatitmeanstobeadefine
Resolves #1358, /code/defines/obj.dm reorganization
2015-05-13 09:23:56 -05:00
Jordie0608 ec9382c43b Merge branch 'master' of https://github.com/tgstation/-tg-station into ss13hassomanybugsitcountsasanecosystem
Conflicts:
	icons/mob/inhands/items_lefthand.dmi
	icons/mob/inhands/items_righthand.dmi
2015-05-13 20:01:27 +10:00
spasticVerbalizer 1468ad5b6f Heat-proofness now determined by the type of glass in the airlock 2015-05-12 11:33:21 +02:00
Cheridan f3e91beba6 KEEP YOUR HOES IN LINE 2015-05-11 15:58:18 -05:00
spasticVerbalizer 1cc928fac3 Makes the plasteel sheet drop when the assembly is disassembled without removing the sheet, grammars a comment 2015-05-11 21:12:18 +02:00
spasticVerbalizer bccb7cb14f Standardized heat-proofing airlocks 2015-05-11 20:52:31 +02:00
Jordie bd12598404 Merge pull request #9376 from spasticVerbalizer/stackingFalseWalls
Adds check to prevent false wall stacking, fixes #6449
2015-05-11 00:07:11 +10:00
spasticVerbalizer 040fd7d8b7 Change uses of 'usr' to 'user', move checking of wall up so the message actually shows 2015-05-10 13:31:10 +02:00
Jordie0608 f36d6bec08 fixes false rwalls not smooting, actually fixes barnyard improving 2015-05-10 21:17:46 +10:00