Commit Graph

217 Commits

Author SHA1 Message Date
Aranclanos
69c85fa4e9 Makes windows and grilles garbage collect. This will make fires a LOT less laggy. And singularities a bit. 2013-08-23 09:42:50 -03:00
Cheridan
cc1e3d2b6d Merge pull request #1178 from caelaislinn/pugs
Adds pugs, makes pugs orderable via cargo
2013-08-22 22:52:48 -07:00
Cael_Aislinn
194a98736f makes pugs orderable via cargo bay
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-08-17 10:13:08 +10:00
Aranclanos
0ce01d1583 Adding Linda. 2013-08-10 06:15:14 -03:00
carnie
3317aa9fe3 Merge branch 'master' of github.com:tgstation/-tg-station into FUTURE_DNA_2
Conflicts:
	code/game/dna.dm  <-- leave this shit alone unless it's a small-tidy change. ffs.
2013-08-06 09:54:24 +01:00
Giacomand
ce30071077 Runtime fixes.
runtime error: Cannot execute null.on reagent change().
proc name: del reagent (/datum/reagents/proc/del_reagent)
  source file: Chemistry-Holder.dm,308
  usr: null
  src: /datum/reagents (/datum/reagents)
  call stack:
/datum/reagents (/datum/reagents): del reagent("pacid")
/datum/reagents (/datum/reagents): clear reagents()
Chemsmoke (/datum/chemical_reaction/chemsmoke): on reaction(/datum/reagents (/datum/reagents), null)

runtime error: Division by zero
proc name: Topic (/datum/song/Topic)
  source file: musician.dm,193
  usr: Tico-Tico Tambien (/mob/living/carbon/human)
  src: Untitled (/datum/song)
  call stack:
Untitled (/datum/song): Topic("src=\[0x210054cd];import=1", /list (/list))
2013-08-02 00:28:08 +01:00
carnie
02be173c60 Renamed variables:
b_type to blood_type
h_color to hair_color
f_color to facial_hair_color
f_style to facial_hair_style
h_style to hair_style
2013-08-01 13:48:41 +01:00
Matevž Baloh
5e043a6e72 Merge pull request #973 from Incoming5643/magic
Adds a new wizard spell: Flesh to Stone
2013-07-24 12:53:08 -07:00
Incoming
30dfa96b23 *minor tweaks for Gia
*the statue's attackby has been relaxed so any item can whack it without checks
*The mimic's check for mobs from lapsed flesh to stone spells has been simplified
*The reason this check works is because when a statue runs out of time it locs its contents, so if the statue was inside something else (in this case a mimic) they end up in the mimic's contents.
2013-07-19 09:30:41 -04:00
supersayu
941631b664 Removes the spacevine-attack code 2013-07-18 23:22:32 -04:00
Incoming
0739ea2b97 Statue Bugfixes
*the targeting for the spell has been reworked so there's no chance of people in the same loc getting stoned instead of your intended victim. As a result of this improvement, wizards can now cast the spell on other wizards with reckless abandon
*Flesh to Stone and the Staff of Animation play nicer with each other now, no more mobs getting trapped in item mimics after escaping the statue.
*Minor tweaks to the monkey statue, which looked dumb
2013-07-18 22:45:02 -04:00
supersayu
528dd9c31a Grab fixes and scythe tweaks
Fixes the grab timer; there will now be a delay between grab upgrades.
Fixes grab process so you no longer have to spam click before it disables itself.  Fixes issue #577

Fixes issue #253:
Prevents grab and throw when the affected mob is buckled.
Prevents tabling a mob when that mob is buckled.

Prevents you from dropping scythes on a table or rack if there is a space vine in that square; it will now auto-attack the vine instead.  Also auto-attacks vines if you click the floor under them.
2013-07-17 15:50:33 -04:00
Incoming
d8e55e67cb *statues are now a subclass of lockers (stripped of most its procs) to fix some inheritance problems
*statue sprites updated from "granite" to "marble" to fix some contrast problems
*statues now get their Health from their target's current health, healthy humans and monkeys will have 200 health before shattering, corgis will have 120 health. Injured targets will make for easier to smash statues.
*likewise when a mob is unstoned it will take any damage the statue took as brute damage.
*Replaced godmode with a set of vars to assure the mob's health remains constant while a statue
2013-07-17 15:07:38 -04:00
supersayu
3ac2af0e06 Fixes exploit for passing plastic flaps with a locker.
Fixes issue #254
2013-07-17 14:54:34 -04:00
Incoming
b34a683334 *Adds a new wizard spell: Flesh to Stone
*Spell renders one target (choosen from list) immobile and incapable of interaction by encasing them in a breakable statue
*Effect ends after a long while (4 minutes) if the statue remains intact
*Requires robes and has a range of 2 squares, cooldown 60 seconds
*Statue can be animated by Staff of Animation, the spell will still end at the normal time
*Currently can be used on humans, monkeys, and corgis
2013-07-16 22:05:15 -04:00
Cael Aislinn
722d15a43e Merge pull request #916 from Aranclanos/DensityBlockingWindows
Windows attacks not being blocked by grilles and other density objects fix.
2013-07-13 03:40:22 -07:00
Malkevin
7ef7c1a55c Atmos Analyzers added to Atmos
-Atmos Techs spawn with an analyzer in their pocket
-Added 3 analyzers to the atmos tech's wardrobe
-Added Analyzers to the autolathe.

They're a little redundant with PDAs having in built atmos analyzers but as an atmos tech I find them clunky to use for wide areas and prefer hand analyzers due to them not taking away focus. Ironically atmospherics had none of these scanners nearby.
2013-07-07 23:58:16 +01:00
Aranclanos
fa5049ca85 Windows have a new proc, can_be_reached(), it will check if there's an object blocking the way on the turf if a mob clicks on the window. It will make some pretty dir checks and then use CanPass(). And before it starts, it checks if it's a full tile window too. 2013-07-04 10:33:52 -03:00
Cael Aislinn
7321eb7fbd Merge pull request #855 from Giacomand/closet_fix
Closet/Crate/Bin MouseDrop fix. Fixes #854.
2013-07-02 17:03:32 -07:00
Tenebrosity
cd0febfac5 Fixes issue 720. Makes the end construction steps sound better. 2013-06-30 10:43:47 +12:00
Giacomand
29faa3c1fc There is a check for an object's turf, in the closet's mouse drop proc. Fixes #854.
Removed unnecessary checks.
Added missing icons for the bins.
2013-06-24 17:09:48 +01:00
Giacomand
c9dc4c45b5 Merge pull request #823 from sararar/master
Fixed issue #704
2013-06-21 19:08:38 -07:00
Giacomand
be2980a791 Merge pull request #813 from Malkevin/empcrate
Securer secure crates
2013-06-21 19:05:18 -07:00
AlexanderUlanH
4f66da54f1 Fixed some more
Fixed gyro rounds not exploding on windows and grilles.
2013-06-20 21:14:02 -04:00
sararar
ffa7b2f2e7 Issue #704. added a fix so that g# will now work on the space piano. tested and works.
Signed-off-by: sararar <sarajfarr@gmail.com>
2013-06-20 13:13:50 -04:00
Malkevin
096351d52e Securer secure crates
Increased the health of secure crates by a factor of ten.

Originally I was going to null out the projectile proc and add an emp_act instead, but one already exists.
The increased health of the secure crate will allow them to still be broken open from gun fire, but will make it inconvenient enough to dissuade cargo arming up every round, hopefully... (it will take 17 buckshot or 50 lasers to break open a crate)
2013-06-19 15:41:52 +01:00
Cael Aislinn
56f577dc7c Merge pull request #754 from MrPerson/tablefix
Hulks punching tables now break into table parts, not rack parts. Fixes ...
2013-06-12 04:54:01 -07:00
MrPerson
ed1cccdf25 Hulks punching tables now break into table parts, not rack parts. Fixes issue #640 2013-06-11 02:40:20 -07:00
Carnie
968ce3bde1 Merge pull request #747 from KazeEspada/grilles
fixes issue #742 - grilles now drop the correct number of rods when destroyed.
2013-06-10 00:44:00 -07:00
KazeEspada
804f509639 fixes issue #742 2013-06-09 19:06:15 -07:00
Cael Aislinn
871b775100 Merge pull request #655 from Carn/HelpersTidy
*Small tidy-up of various helper procs*
2013-05-31 23:24:38 -07:00
Pete Goodfellow
7ed93cfad1 Fixes #540 cloning welders
Fixes #486 examining jetpacks
Fixes #532 cyborg camera names
Fixes #510 attack windows with rods
Fixes #533 helmet sprites don't update
2013-05-29 00:35:40 +01:00
Ikarrus
b77c9751a0 Merge pull request #645 from Tenebrosity/miscissuefixes
[MAP] ~25 typo fixes, updated DJ station instruction sheet, replaced missing disposal pipe underneath HoP office door
2013-05-27 12:08:53 -07:00
carnie
b84d12d949 *Small tidy-up of various helper procs*
-Turns out there was already a Gaussian PRNG proc already, used by mechs and turrets. I've replaced it with my one as mine has almost half the cost. (currently broken! still waiting for fixes to be pulled!)
-replaced between(min, val, max) with Clamp(val, min, max)
-get_turf(thing) now uses var/list/locs to locate its turf, rather than iterating up through loc of its loc of its loc...etc
-sign(num) moved to maths.dm
-InRange(val, min, max) replaced with IsInRange(val, min, max) (they were identical)
-Removed ismultitool() iswrench() iscoil() iswire() iswelder() iscrowbar() etc
-removed modulus(num) as abs() performs the same task! *roll-eyes*
-removed get_mob_with_client_list() as it is no longer needed (we have var/list/player_list now)
-removed get_turf_or_move() as it simply called get_turf
-removed get_turf_loc() as it was identical to get_turf()

*Additions:*
-The "Declare Ready" link in the lobby will automatically become "Join Game" if the round starts before you declare ready, so you don't have to click it twice
2013-05-27 12:21:43 +01:00
Tenebrosity
6e873faf1f * Edited encryptionkey.dm: Fixes about nineteen typos
* Edited tools.dm: Fixes "screwwy" typo in screwdriver description
* Edited paper.dm: Updates DJ station instruction sheet in light of the removal of the broadcaster and receiver from the DJ station
* Edited lib_items.dm: Fixes typo in "unwrenched" in a bookshelf deconstruction step
* Edited tgstation.2.1.2.dmm: Adds updated DJ station sheet to DJ station, replaces missing disposal pipe underneath HoP office door.
* Edited utility_closets.dm: Fixed oxygen closet description
* Edited DJ station paper to read better
2013-05-26 18:16:02 +12:00
Ikarrus
6932c4e32d Requesting a re-merge of another change that has mysteriously disappeared, https://github.com/tgstation/-tg-station/pull/485
Originally merged by @Giacomand
2013-05-23 20:19:04 -06:00
Malkevin
7aac619244 Merge branch 'master' of https://github.com/tgstation/-tg-station into bucketlove 2013-05-18 15:37:32 +01:00
Cheridan
c00f97216c Phase 3 & 1/2
Adds chef locker
Serves up the service server to serve your servers.
2013-05-17 19:15:01 -05:00
Ikarrus
9850a66cb0 Merge pull request #582 from Cheridan/radios
Phase 2 of my master plan:
2013-05-17 07:46:40 -07:00
Cheridan
4ca036543c -Updates DJ station infosheet.
-Adds service headsets to barman/botanist closets (chef doesn't get one for now since he doesn't have a closet, all his spare stuff is just placed in a crate)
2013-05-16 15:16:21 -05:00
Malkevin
951ba1bede changed wetness check from constant to variable reference 2013-05-14 17:42:46 +01:00
Malkevin
cef6bd2786 Better Mop and Cart love
Slight tweak to the behavior of attacking the janicart with a mop.
Changed it so that it stores the mop when it is soaked (or the bucket is empty), as I'm sure most players would prefer their mop to always be fully soaked when they remove it from the cart.

Also changed the examine text from 'water' to 'liquid' as it was misleading. It can actually be filled with any reagent, even welder fuel...or acid... or blood... or dr.gibb...space lube... you get the picture.
2013-05-14 17:02:35 +01:00
Pete Goodfellow
46b8ba8341 Merge branch 'master' of github.com:tgstation/-tg-station into chemistry
Conflicts:
	code/game/objects/items/weapons/tools.dm
2013-05-12 15:09:21 +01:00
Cheridan
a6c3f4a78d Merge branch 'master' of https://github.com/tgstation/-tg-station into Master
Conflicts:
	maps/tgstation.2.1.2.dmm
2013-05-04 13:04:47 -05:00
Cael Aislinn
f0a51af7f4 Merge pull request #499 from Giacomand/ministation_merging1
Closet Cleanup and Bins.
2013-05-03 21:57:53 -07:00
Giacomand
35f6a979bc * Small fix for closets picking up anchored items.
* Made closets/crates pick up on their turf during initialization.
2013-05-04 05:07:36 +01:00
Aranclanos
74fb61eeee Merge pull request #463 from Ikarrus/reactive
[MAP] Reactive Armor as objective
2013-05-03 19:24:58 -07:00
Giacomand
77b0fce80f * Fixed a typo. 2013-05-04 01:10:32 +01:00
Giacomand
b4229b0b24 * Fixed an accidental commit. 2013-05-03 22:42:12 +01:00
Giacomand
343bfe90b2 This commit was made to help increase the compatibility between MiniStation and /tg/station.
* Restructured closets to be easier to add new features.
 * Added trash bins that you can hide in.
 * New sound effects for the bin, they are royalty free.
 * Personal lockers can now be (un)locked with your PDA/Wallet/Whatever.
2013-05-03 22:32:17 +01:00