Commit Graph

822 Commits

Author SHA1 Message Date
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
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
Remie Richards
d9ec8a1008 area/proc/get_apc() is no longer shit and does not lag (AT ALL) on large areas anymore, the new method stores a list of all APCs in the world, and checks if their area var is equal to the area get_apc() was called on. 2015-06-30 12:20:28 +01:00
phil235
e8d3deafab Merge branch 'master' of https://github.com/tgstation/-tg-station into AcidFix
Conflicts:
	code/modules/clothing/masks/gasmask.dm
2015-06-28 15:22:21 +02:00
Cheridan
46d7fb9bbd Merge pull request #10168 from phil235/FireaxecabinetFix
Fixes runtime with do_after()'s that don't use a target.
2015-06-26 20:12:15 -05:00
Cheridan
3f1ecc5721 Merge pull request #10097 from phil235/SomeFixes
Some little fixes
2015-06-26 15:24:46 -05:00
phil235
adf553db5c Removes the singularity's toxin damage effect on mob. 2015-06-26 18:14:34 +02:00
phil235
2aeefad94d Fixes runtime with do_after()'s that don't use a target.
Adding missing "target=src" to a couple do_after() calls.
You can now close a fire axe cabinet by clicking it with a full hand (if it's not broken/locked)
2015-06-25 19:05:23 +02:00
phil235
a029f2852a Merge branch 'master' of https://github.com/tgstation/-tg-station into AcidFix
Conflicts:
	code/modules/reagents/Chemistry-Reagents/Blob-Reagents.dm
2015-06-24 21:15:09 +02: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
phil235
63358dcc78 fixing the formula. 2015-06-22 18:12:52 +02:00
phil235
13fdc68581 fixes singulo toxdamage. 2015-06-22 16:51:28 +02:00
phil235
1accee1c36 Fixes singularity not applying its tox damage to mobs. Adjusted its radiation and toxdamage values.
Fixes simple animals that needs to breath not taking damage from lack of gas to breath on space turfs.
Fixes revenant not being spaceworthy.
Fixes simple_animal accumulating radiation indefinitely because they are unaffected by it.
2015-06-22 16:10:24 +02:00
phil235
3f57259c69 Merge pull request #9466 from Fayrik/TheNanoing
The Nanoing (Episode 2: The Fix Wars)
2015-06-22 14:24:20 +02:00
phil235
b0cd6d34b1 Lots of work on acids, smoke, foam, reagents reaction() proc.
- fixed the fraction argument in reaction(...., INGESTED, fraction) so the proper amounts of each reagent react, not all of it.
- slight optimization of datum/reagents/reaction()
- small optimization /datum/reagent/proc/reaction_mob
- the smoke's reagents no longer do direct transfer upon crossed()/move() but uses "reagents.reaction( mob, TOUCH)" only.
- fixes no ingesting smoke if it's in the dark.
- removed block gas smoke effect flag from clown mask and other non "actual" gas mask.
- refactor how protection against touched chems being absorbed is done. get_permeability_protection() to get that protection. No more

simple RNG get touched or not, now the amount that touches you depends on your protection and the volume in question.
- changes acid_act to take volume into account.
- chem_smoke now uses process() just like foam, we remove the reaction from crossed() and Move(), it's only done in process() now.
- optimization of effect/smoke, OOP! And now all smoke effects use objprocessing instead of shitty sleep/spawn
- removed mob var/coughedtime.
- add a volume check to item/acid_act(), there's a threshold to be able to melt and then a probability to melt (acidpwr&volume).
- greatly lowered the amount of reagent in the smoke from dead blobspore (so the volume isn't enough for melting)
- human/acid_act(): damage to limbs depends on acidpwr&volume.
- fixes metalfoam not working.
- smoke powder: only one start() call.
- Amound of smoke objects depends on amount of smoke recipe created.
- Adds an argument to add_reagent() to block automatic call of handle_reaction()
- When using reagents/proc/trans_to(), reactions are now only handled after every reagent is transfered and not before.
- Amount of smoke objects depends on amount of smoke reagent created.
- radius of foam reaction depends on amount of foam reagent created.
- The amount of other reagents inside the smoke/foam decides the life expectancy of the effect.
- The amount of reagents in each small smoke cloud/foam cell depends on the amount of other reagents in the initial reaction but also

how much smoke/foam was created (more smoke means dilution of the reagents).
- smoke/foam's reagent reaction on mob decreases the life expectancy of the effect (to avoid reagent duplication)
- The amount of reagent reacting with atoms is less if the life expectancy is high.(to avoid reagent duplication)
- The amount of movement from the smoke now depends on the number of smoke clouds created.
- removing some useless code in chem_grenade/prime().
- When calling human/acid_act(), item acid melting chance lowers after each each successful melt in the list, some of the acid is

"used" to melt that item so the next items have a lower chance to melt (to make melting every clothing harder).
- remove the banned reagent list from sprays, not needed anymore now that acid is nerfed.
- chem_grenade reaction, if there's no reagent left after reaction (smoke/foam/etc, reagents cleared) you don't get the steam effect

and immediate reaction with all atoms around the grenade explosion. (Fixes foam cleaner grenade deleting bloodstains around it as soon

as the grenade explodes, even if the foam hasn't reached the tile yet).
- melted storage items now drop their content instead of deleting everything.
2015-06-22 00:35:24 +02:00
Swag McYolosteinen
859c5e66e0 Merge pull request #9930 from duncathan/givinunarysomelovin
Brings some unary devices closer to the present
2015-06-20 20:14:02 +02:00
Cheridan
a2948ba203 Merge pull request #9956 from Jordie0608/whocodesthecodemen
Various admin improvements
2015-06-20 00:53:30 -05: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
Remie Richards
8820662c31 Merge pull request #9847 from Xhuis/ALL_HAIL_LORD_SINGULOTH
ALL HAIL GOD-EMPEROR SINGULOTH
2015-06-17 10:47:35 +01: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
phil235
ae8c69f9a7 Merge pull request #9955 from kingofkosmos/spanspaceremoval
Unnecessary space removal from spans and messages
2015-06-15 18:20:04 +02:00
phil235
aaf8f2893f Merge pull request #9922 from Iamgoofball/patch-80
Removes RNG chance to fail to emag an APC, along with the emag delay
2015-06-15 14:16:55 +02:00
Iamgoofball
a00e11520c Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics 2015-06-14 15:42:15 -07:00
xxalpha
b2e84a0d3c Put drop_item() calls inside ifs. Replaced some drop_item() with unEquip( 2015-06-14 20:11:40 +01:00
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
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
Jordie0608
5ef93b2225 overlays for computers 2015-06-13 20:07:48 +10:00
Iamgoofball
7b475df05e removes the do_after() from emagging apcs 2015-06-12 15:49:22 -07:00
Iamgoofball
a19e95dba5 Removes RNG chance to fail to emag an APC
literally why was this a thing

see the pr that removes it from borgs for reasoning
2015-06-12 14:59:05 -07:00
Iamgoofball
f992eb1af0 Adds feedback gathering for a hell of a lot more things. 2015-06-09 21:52:46 -07: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
Xhuis
a9c5a1d9ea Adds a stage six singularity. 2015-06-08 14:36:50 -04:00
Iamgoofball
988ff28734 adds panel open icons for the new buildables 2015-06-07 03:55:28 -07:00
Cheridan
46acc2a55d REMOVES CABLE CUFF 2015-06-06 16:21:41 -05:00
Iamgoofball
b65c7a36df Upgrade Update: Bluespace Boogaloo 2015-06-05 23:56:09 -07:00
Cheridan
a19f1801ff Merge pull request #9699 from KorPhaeron/turf
Changes how destroying/building turfs works
2015-06-02 23:15:42 -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
Aranclanos
e7c0d7e95c Removes unsimulated turfs.
Moves shuttle turfs to paths under /turf/simulated/floor and /turf/simulated/wall
Players can now safely build on top of shuttle turfs
Fixes #1711
Adds several but not all paths for the different types of floor turfs, most of them in plasteel_floor.dm
The turf pathings are still in need of a deeper organization, but this is at least a start
2015-06-01 23:24:18 -03:00
Firecage
f79e0fc1aa Updates more paths, for example obj/stuff to /obj/stuff 2015-05-31 17:48:33 +02:00
KorPhaeron
97990c94cc Changes how destroying turfs works
Turfs now have a baseturf var which determines what is "under" every
turf. The default is space.

Actions that previously did changeturf(/turf/space) (like bombs or RCD
deconstruction) now do changeturf(baseturf). Functionally the same for
the station, but allows special turf types that don't break to space
(such as planet tiles).

Right now the asteroid tiles are the only thing with a baseturf other
than space (the baseturf is an asteroid tile).

Baseturf is tracked when new things are built, so building a floor and
then a wall on the asteroid tile, and then bombing that wall will return
it to an asteroid tile, not space.

Allows building on asteroid tiles now that doing so wont randomly make
holes to space. Time for giant mining forts.

I should have done this years ago for away missions.

Also added myself to admins.txt
2015-05-29 18:43:34 -05:00
Cheridan
cbb91c601f Merge pull request #9616 from Jordie0608/ifhuamnityexpandstoanothersolarsystemwewillhavetorenamesunglasses
Bugfix goes Forth+1
2015-05-24 23:39:40 -05:00
phil235
f643769ef4 Fixes some runtimes with bluespace artillery, handcuffs on simple animals, lobby music start, stunbaton attack, kitchen bowl update_icon, particle accelerator admin log message, and plasmaman spec_life(). 2015-05-23 22:34:04 +02:00
Jordie0608
68eda1787b fixes cells corrupt()ing maxcharge, mime spells as borg and condi botles not allowing naming 2015-05-23 19:56:03 +10:00
Cheridan
9dfc13cbb7 Merge pull request #9491 from RemieRichards/ManyImageCaches
Misc Image Caches
2015-05-15 13:44:21 -05:00
Razharas
3410d3a0f6 Merge pull request #9461 from xxalpha/petethegoat
A handful of fixes.
2015-05-15 02:05:16 +03:00
Remie Richards
28cd8ea0f1 Image Caches:
Mining rock turf edge overlays
Alien weed overlays
SMES overlays
2015-05-14 16:40:15 +01:00
xxalpha
4da1eb4399 Fixed emitter beams not being reflectable. 2015-05-13 21:45:46 +01:00