Commit Graph

173 Commits

Author SHA1 Message Date
Aranclanos
ccae5781c5 added two defines CLICK_CD_RANGE and CLICK_CD_MELEE (4 and 8), replaced all changeNext_move() procs to use these two defines.
Added melee click cooldown for paper spam on cameras.
2014-08-03 22:14:56 -03:00
AndroidSFV
817278e5ad Resin walls and weeds cannot be mash-attacked. 2014-07-30 21:04:34 -05:00
Firecage
7779a2f7e8 Signed-off-by: Firecage <firecage@hotmail.com> 2014-07-20 21:10:53 +02:00
ikarrus
a89054dfaa Resolving Conflicts:
_maps/map_files/tgstation.2.1.3.dmm
	code/controllers/configuration.dm
	config/game_options.txt
2014-07-01 13:31:08 -06:00
Aranclanos
c65aa2b5a4 Merge pull request #4000 from Cheridan/terribleidea
MONKEY MODE REDUX
2014-06-30 16:27:22 -03:00
ikarrus
bf5200daf8 [Config] Security Officer Scaling
Intended for high-population servers

Open security officer positions scale with population, between 5 slots at ~40 players to 12 slots at ~96 players

Default coefficient is 8, but may be modified (or disabled) in the config.

Extra lockers will spawn if there aren't enough lockers.
2014-06-15 21:24:07 -06:00
Cheridan
352d5a5627 MONKEY MODE REDUX
AHUAHEUAHUHEGUEHGAUHEGUAEH

monkeys will now possibly transfer all diseases on bite because that's how diseases kinda work
2014-06-14 21:30:25 -05:00
Cheridan
b80e9eda57 Nar-Sie update 2014-06-11 14:19:58 -05:00
Cheridan
3a0bd3de28 Merge branch 'master' of https://github.com/tgstation/-tg-station into MeteorsSuck
Conflicts:
	code/game/turfs/simulated/walls.dm
2014-05-13 14:03:42 -05:00
fleure
e13ab9422d Merge pull request #3610 from Aranclanos/washingmachine
Washing machine fixes
2014-05-13 16:55:26 +01:00
Aranclanos
b544a945a9 Fixes issue #2489
Fixes issue #119

Transferred all the different colours of under clothes and shoes to obj/item/clothing/under/colour/XXX and obj/item/clothing/shoes/sneakers/XXX
Added two extra options to the spawn menu of the game panel, clothing and food.
2014-05-01 06:01:14 -03:00
Aranclanos
cc34aae3e3 Reisin walls and doors will now block superconductivity (heat)
Reisin membranes won't
2014-04-30 07:40:41 -03:00
VistaPOWA
19402bd258 Handle alpha 0 2014-04-27 15:57:18 +02:00
VistaPOWA
fcf98c15f9 Checking for divide by zero 2014-04-27 14:41:53 +02:00
VistaPOWA
4c7cbeff08 Fixes bad indent 2014-04-27 14:34:52 +02:00
VistaPOWA
14ad291ba2 Merge remote-tracking branch 'upstream/master' into smoke_fade 2014-04-27 14:16:55 +02:00
VistaPOWA
5a197e8dec Adds a fancy fade-out for smokes
Originally from Bay.
Made by Loganbacca, ported by me.
2014-04-27 14:16:50 +02:00
fleure
a3b01d017e Merge pull request #3495 from phil235/CocoonattackedmsgFix
Fix for #3151
2014-04-23 15:12:38 +01:00
Cheridan
f83f1932b2 Meteor code uses OOP principles a little better now
Adds new types of meteors with different effects.
Meteors drop some ore when they hit.
2014-04-23 01:37:44 -05:00
phil235
382397a6ea Fix for #3151
Removes the useless periods.
2014-04-21 19:36:33 +02:00
Aranclanos
fc915bf800 If you try to use the teleporter and the teleport was rejected for any reason (like having a nuclear disk), you won't get the chance to get a random damage from the teleport.
Fixes issue #2236.
Removed some spawn() calls.
Removed the chance of fail from the portal effects (the blue portals made with hand teleporters).
The portal datums will now return 0 if the teleport failed, and now use a new proc, start(), instead of New() to handle themselves.
Standarized teleport.dm from the helper_datums folder.
Removed the checks for centcomm z level and away missions z level for teleports. Now you can go there.
changed the /red messages from the teleports datum to span classes.
The "[something] bounces off of the portal!" were replaced for "The portal rejects [something]".
Removed an extra "the" on those messages.
2014-04-02 08:36:33 -03:00
Aranclanos
7bcb69ad88 Removes the click cooldown from almost everything, now it should be always be 0.1 seconds.
Ranged weapons and laser eyes have a cooldown of 0.4.
Grilles, windows, windoors, walls and blobs have a cooldown of 0.8.
Hitting mobs will also have a cooldown of 0.8.
Removes the unused USEDELAY flag.
2014-03-28 06:32:47 -03:00
Mloc-Hibernia
8af8a43d6f Initial pass to convert LF to CRLF
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>
2014-03-24 08:53:40 +00:00
MrPerson
ee716586b9 GEE THANKS GIA FOR MORE CONFLICTS (gravitygen changes to c4 vs qdel)
Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel_r

Conflicts:
	code/game/objects/items/weapons/explosives.dm
2014-03-21 19:04:51 -07:00
Razharas
4c4cadb48c Merge pull request #3086 from Giacom/gravity_generator
[MAP] Added a new gravity generator which will produce gravity for the station.
2014-03-21 14:06:40 -07:00
MrPerson
6930283efc Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel_r
Conflicts:
	code/game/gamemodes/changeling/changeling_mutations.dm
	code/game/gamemodes/changeling/changeling_powers.dm
	code/game/gamemodes/malfunction/Malf_Modules.dm
	code/game/objects/items/weapons/tanks/watertank.dm
	code/game/objects/structures/tables_racks.dm
	code/modules/research/server.dm
2014-03-21 03:05:39 -07:00
Giacomand
cc4dd68bdf Added a new gravity generator which will produce gravity for the station.
Sprites by Ausop, which he posted in his sprite thread.

The gravity generator is very sturdy, as it is almost indestructible, but explosions can break it and it will need repairs.
Changed C4 to stop del()'ing and instead will only use ex_act().
Added an interact_offline variable for machines that will allow you to interact with them even if they are depowered. The gravity generator only uses this at the moment.

Removed the stun that people get when gravity changes.
Shuttles have gravity still.

Added a gravity generator room to the west of Engineering. It is very secure, with a foyer and requiring CE or Captain access. There are instructions on the table for repairing and enabling/disabling the machine.
2014-03-15 16:59:48 +00:00
Aranclanos
fcb3bc66c7 Vaultspawners (those things never used that an admin might once in a blue moon) will now use the ChangeTurf() proc and won't make Linda cry 2014-03-13 22:23:24 -03:00
MrPerson
3c58091437 Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel
Hopefully nothing went wrong but you never know.

Conflicts:
	code/FEA/FEA_fire.dm
	code/controllers/supply_shuttle.dm
	code/game/gamemodes/changeling/changeling_powers.dm
	code/game/machinery/autolathe.dm
	code/game/machinery/drying_rack.dm
	code/modules/hydroponics/hydroponics.dm
	code/modules/projectiles/projectile/magic.dm
	code/modules/reagents/Chemistry-Recipes.dm
	code/modules/reagents/reagent_dispenser.dm
2014-03-02 21:39:27 -08:00
Incoming
09124ccf6b If a hand teleporter portal is forced to spawn on top of you (meaning you're completely encased in impassible material) you will automatically teleport with it. 2014-02-26 19:47:29 -05:00
MrPerson
9eee3e5067 First pass at a qdel() garbage collection system for tgstation
Works pretty well. If it can't GC something, it'll just del() it and be done.
Speed is amazing, holy shit.

New procs you should be aware of:
qdel(atom/movable) - sets up an object for garbage collection. Call this rather than del(atom/movable).
atom/movable/Destroy() - called right before the object is GC'd, so it still has a loc. Also called if the object is del()'d.
new controller - garbage.dm has all the details on this. Basically it nulls all references on GC'd objects and force del() them if necessary.
Generally speaking, objects should use Destroy() for behavior prior to deletion rather than Del(). You should also always call the parent so the object gets the right gc_destroyed var set.

ISSUES:
Tries to GC mobs atm. This actually works for new players, not so much for humans/monkies/simple_animals/anything. I'm guessing it needs to clear out their mind and HUD and maybe other things.
Gibbing is really bugged. It works, but the overlays just sit there for awhile and ugh. I'm very tempted just to del() mob/living and mob/camera and call it a day.
qdel() equipment doesn't unequip the item.
Pipes don't generally GC correctly. Debugging suggests they get referenced in many pipenets and that isn't cleared properly. However some do work fine. Need assistance here.
Bots don't GC, probably in the radio controller.
Lots of other shit doesn't GC but it's hard to find them because of the pipe spam.
I think I'm calling Destroy() twice by accident.
2014-02-23 14:55:12 -08:00
Cheridan
89170dd6d9 Merge pull request #2867 from Aranclanos/hardestfix
Smoke effect runtime fix.
2014-02-22 13:12:11 -06:00
Aranclanos
8ca49d5e90 Fixes a small runtime related to deleting smoke that doesn't exist after a spawn() 2014-02-21 08:30:46 -03:00
hornygranny
ed12a9cfb0 missing exclamation points 2014-02-20 12:41:23 -08:00
hornygranny
a86de57c05 Fixes #2726 2014-02-20 12:11:00 -08:00
Aranclanos
e529a1ae84 small fix for an runtime related to ion trails (that smoke coming out from your jetpack when you move) 2014-02-13 18:08:41 -03:00
adrix89
c1ae410869 Fixes 1653
Projectiles now have a layer threshold 2.75 which is the spiderlings layer.
2014-02-03 17:15:49 +02:00
fleure
fba7c32a5c Merge pull request #2455 from Rolan7/Issue297_Gib_Fix
Issue 297 Gibbing in pipes fix
2014-01-26 10:56:26 -08:00
Rolan7
5d931d70ef Larvae who chestburst while their host is swallowed are now properly added to stomach_contents, so they can be regurgitated. As are the gibs from the gibbing.
Tidied up the loop in alien_powers.dm
2014-01-20 15:43:43 -05:00
Pete Goodfellow
e8ed1a83f7 Merge branch 'master' of github.com:tgstation/-tg-station into waistcoat2
Conflicts:
	code/game/objects/structures/crates_lockers/closets/job_closets.dm
2014-01-20 19:29:47 +00:00
Rolan7
5f1fae05dd Gibbing now occurs in whatever the mob happens to be in, instead of fetching the turf. 2014-01-20 01:37:43 -05:00
Pete Goodfellow
5222191b73 Changes the waistcoat path from /obj/item/clothing/suit/wcoat to /obj/item/clothing/tie/wcoat so you can wear it under a spacesuit or suit jacket.
Also makes ties show up on the jumpsuit object.
2014-01-19 14:50:27 +00:00
Giacomand
11bca59614 Refactored the code to remove most icon operations for changing an icon's colour. I had to manually set all the icons, which are subject to colour change, to be have a white/grey icon, so that the colours added properly, and then have them coloured in the code. This means the icons for runes, the reagent beaker overlay, smoke and etc will all be white. They now all use the new 500+ color variable.
The only noticeable gameplay difference is that you can't choose your graffiti's shade.
2014-01-15 21:30:55 +00:00
Giacomand
f1e7637bab Disabled the game using set background by making all instances of it use a define, which can be changed in code/_compile_options.dm
Testing has revealed that it reduces the sluggishness of the game, though it will spike from lag when the singularity is loose. Thanks to ChuckTheSheep for suggesting it.

Server owners who want to keep set background enabled can do so by changing the define.
2014-01-10 18:32:28 +00:00
Giacom
537b6ddba0 Merge pull request #2214 from Aranclanos/IntiFetishNotInMyGame
Removes the gag ball.
2014-01-03 04:19:29 -08:00
Aranclanos
1e3f2c37a6 Removes the gag ball. 2014-01-01 23:43:01 -03:00
Cheridan
bb9c09df46 Obsoletes flags = FPRINT | TABLEPASS*
*TABLEPASS was already totally obsolete.
FPRINT was used, but it was on virtually everything anyway.

Removes those flags from every instance where they were used. Also assigned and removed other flags where it made sense.

If it is desired, I can revive the flag as NOFPRINT, which would retain the original functionality, though inverted. That way it would be be used only  where it was intentional (holodeck items could use this for example).
2013-12-30 15:03:17 -06:00
Giacom
5fb0d05dd1 Merge pull request #2096 from Aranclanos/SweetLindaNobodyWillTouchYou
Small fixes for Linda.
2013-12-21 13:57:15 -08:00
Giacom
9d24a900ae Merge pull request #2066 from Perakp/slipFix4
No slipping when lying down
2013-12-21 13:54:39 -08:00
Aranclanos
213f3fff31 Some fixes for Linda, now the Move() proc of objects that block air is different. Example below.
object/Move()
   var/turf/T = loc
   ..()
   move_update_air(T)
2013-12-19 22:13:21 -03:00