Commit Graph

537 Commits

Author SHA1 Message Date
Swag McYolosteinen 6b091e0cb6 Merge pull request #11086 from freerealestate/rcdrebalance
Rebalances RCD construction costs around metal construction menu costs
2015-08-14 15:14:25 +02:00
Jim Boonie ebea552319 - Rebalances RCD construction costs around metal construction menu cost values
- Makes matter cartridges worth twice as much matter as metal/glass sheets
2015-08-08 06:15:35 +12:00
Remie Richards 4870122858 Rnd machines and Pizza boxes now use real wire datums, instead of the ancient method of list+var, Because of this they now also respond to Multitool-Pulsing.
Adds GetColour(index) helper to wire datums.
2015-08-07 03:35:10 +01:00
francinum 026e20f968 Design Datum fix 2015-08-05 12:48:51 -04:00
Jordie d5a88d3f98 Merge pull request #10957 from Core0verload/surgery-organs-implants
Implants, Surgery and Organs rework: Phase 1
2015-08-04 21:45:02 +10:00
c0 600d424ea5 Moved cyberimplants to internal organs system 2015-08-02 22:28:45 +03:00
phil235 40a1c3c5de Merge pull request #10935 from bear1ake/ian-stuff
FIX IAN STUFF (paths)
2015-08-01 17:27:36 +02:00
c0 04f7b3f2de Surgery, Implants and Organs rework: Phase 1 2015-07-31 22:18:31 +03:00
bear1ake 5af0bdec25 fix ian stuff 2015-07-31 01:18:03 +09:00
phil235 e670cec521 Fixes being able to insert sheets into the protolathe from a distance (w/o telekinesis).
Removes some unnecessary icon_state stuff, plus moving busy = 0 to after the end of the insertion animation.
2015-07-29 20:31:11 +02:00
Chiefwaffles 1c59a84660 Dumb byond stuff fixed and merge conflict fixed for the gazillionth time. 2015-07-25 16:19:21 -07:00
Jordie f7e4297273 Merge pull request #10705 from KorPhaeron/golem
Golem Logging
2015-07-25 19:08:56 +10:00
bgobandit df836d0f73 Cats and pugs now respond when you pet them. Pugs and corgis are now under the same dog parent, and all dog code is moved to dog.dm (corgi.dm and pug.dm no longer exist). Updates pathing across all areas of code and on all included maps. Fixes a minor pet collar naming bug. 2015-07-23 10:49:06 -04:00
Chiefwaffles eaa271b8c2 FIXES A CONFLICT THAT ISN'T EVEN MINE 2015-07-22 17:36:08 -07:00
KorPhaeron 99bfeb75b5 Replaces usr with user 2015-07-21 12:17:46 -05:00
phil235 452313a5fa Merge pull request #10534 from Xhuis/borg_deconstruct_all_firelocks_on_the_station_then_flood_plasma
Firelock Construction and Deconstruction
2015-07-21 17:52:14 +02:00
KorPhaeron aa69941ba8 Removes use of objectives, replaces with notes 2015-07-20 06:13:28 -05:00
KorPhaeron d8b874fc25 Golem Logging
Gives golems the name of their master in an objective so it can be
easily checked by admins when they start punching people to death or by
the golem itself when it forgets after wandering off.

Adds a warning to admins when traitors start creating golems.

Logs who creates golems.

Requested by Ausops
2015-07-19 09:18:34 -05:00
Chiefwaffles 2c3db425fa Resolve merge conflict, step 1. 2015-07-16 12:35:58 -07:00
phil235 34db8dd695 Merge branch 'master' of https://github.com/tgstation/-tg-station into MechRefactoring
Conflicts:
	code/game/mecha/equipment/mecha_equipment.dm
	code/game/mecha/equipment/tools/medical_tools.dm
	code/game/mecha/equipment/tools/tools.dm
	code/game/mecha/equipment/weapons/weapons.dm
	code/game/mecha/mecha.dm
2015-07-16 13:50:01 +02:00
Firecage 4688c2c969 Fixes proc arguments 2015-07-15 23:52:35 +02:00
Chiefwaffles d31d1a017a Adds emag/emp effects, makes AAS fully constructable, adds a circuitboard for the AAS, and adds overlays for announcements/errors. 2015-07-14 20:34:53 -07:00
Xhuis 4207de5159 Fixes a typo 2015-07-14 23:22:23 -04:00
phil235 359a270de6 Merge branch 'master' of https://github.com/tgstation/-tg-station into MechRefactoring
Conflicts:
	code/game/mecha/equipment/tools/medical_tools.dm
	code/game/mecha/equipment/tools/tools.dm
	code/game/mecha/mecha.dm
2015-07-14 01:20:37 +02:00
Xhuis dc982fe815 Changelog + board added to autolathe 2015-07-11 11:58:41 -04:00
duncathan c3b095a8b3 adds scanners to R&D; adds changelog 2015-07-10 23:15:44 -06:00
Jordie 8bf129cc06 Merge pull request #10336 from AlexanderUlanH/riotshotguns
Rubber Shotgun Pellets
2015-07-09 20:56:25 +10:00
MrStonedOne 0828401db9 Prevents sentience potion from working on monkies
Logic: they can be converted to humans, this be too OP
2015-07-07 13:53:36 -07:00
phil235 ea1780ce97 - Mech equipment was using its unique processing method, with specific timing for each equipment, but now it uses obj processing, I
changed the values so the equipment effect stays the same. Remove global_iterator datum.
- fiddled with equip_ready procs of mech tools.
- removed mecha/proc/do_after and /enter_after() procs.
- Renamed mech sleeper occupant var to "patient" to avoid confusion with the occupant of the mech.
- all non instant tool (drill) now show a progbar when drilling etc..
- action cooldown now use do_after_cooldown() (that itself uses do_after) and start_cooldown (for instantaneous actions).
- Removed mecha_equipment's destroy proc, it's now all in Destroy(). No confusion.
- modified mecha_equipment/proc/can_attach() to not check istype(mecha) b/c it can't not be. (so the child only have one istype check.
- Removed diamonddrill/can_attach() , all done at drill level.
- armor booster now only for combat mech, instead of all except honkmech.
- Removed dynhitby, dynbulletdamage, dynattackby, dynusepower(), dyngetcharge(), dynabsorbdamage()
- I split the tools.dm file into smaller ones: work tools, mining tools, other tools.
- I split mecha.dm into mecha.dm, mecha_topic.dm and mecha_defense.dm
- refactored mech weapon ballistic/launcher, new proj_init proc, more OOP.
- Moving consumes energy! Lights consumes energy. Fixes #9425.
- Fixed #7354 xeno not bursting if host is inside a mech.
- Added action buttons to mech. Moved toggle lights, internal tank, eject, view stats from verbs to action buttons, these can now only

be done via these buttons (removed them from the big stats window).
- Removed port connect verbs b/C it's automated now.
- regular hud is no longer hidden when inside a mech (doesn't matter b/c you can't interact with most stuff in it while in a mecha). Fixes issue 10387
- can't walk when shooting projectiles. Makes walking on your projectile a bit harder. Helps against issue 10315 (but doesn't fix it).
- also made into action buttons: the special abilities of certain combat mechs.
- Added thrown alerts for mech charge and integrity.
- Fixes teleporting occupant out not properly removing it from the mech. Fixes issue 10330
- fixes ballistic mech weapons spinning when launched. proc/throw_at() now has a spin argument instead of using var/allow_spin that was added to all atoms just for that.
- added a update_action_buttons() to ai/life() to handle ai mech.
2015-07-07 19:40:32 +02:00
Alexander P. Ulan Hernandez f0d70a42b0 Rubber Shotgun Pellets
Adds rubber shotgun pellets, which spawn in the riot shotguns and can be
produced at an autolathe.
2015-07-02 21:29:18 -04: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
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
LaharlMontogmmery 9591d2255d Hoping this solves the merge conflict 2015-06-27 19:23:13 +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
LaharlMontogmmery 6cab00e31b Reverts BPRED change. 2015-06-24 19:51:28 +02:00
Remie Richards f5f833ecbb Merge pull request #9971 from KorPhaeron/newfloors
New Bluespace/Sepia slime reactions, new var for turfs
2015-06-23 03:43:28 +01: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
Razharas e6b738734a Merge pull request #8876 from xxalpha/fixfixfix
Cyber Implants + (Pt.2)
2015-06-21 22:12:17 +03:00
LaharlMontogmmery 44b10eb779 Nerfs the BRPED range to 7. 2015-06-21 20:00:43 +02:00
LaharlMontogmmery ea9849a436 Reduce range of the BoH to 7. 2015-06-21 17:20:01 +02:00
LaharlMontogmmery b91e99507c Base Changes for BlueSpace Content Transfer 2015-06-21 15: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
phil235 98c158f958 Merge pull request #9845 from AnturK/buttsender
Adds PDA-Message Photo Attachment
2015-06-17 20:36:52 +02:00
phil235 9a1c1ae7af Merge pull request #9967 from Jordie0608/figurediwouldvemissedsome
Fixes computer icon errors
2015-06-16 11:30:44 +02: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
KorPhaeron 99735ea50d New floors from xenobio/new var for turfs
Turfs now have a slowdown var that will determine how fast mobs move on
it.

Bluespace slimes can now create bluespace floor tiles which give -1
slowdown using blood

Sepia slimes can now create sepia floor tiles which give 2 slowdown
using blood

Camera and film reactions merged into a single water reaction

Bluespace crystal reaction moved to plasma
2015-06-15 01:33:00 -05:00
Jordie0608 7279c504c2 fixes server console icon 2015-06-15 14:42:47 +10:00
Cheridan 50686d2200 Merge pull request #9966 from KorPhaeron/timestop
Added new timestop sound from Cuboos
2015-06-14 19:45:17 -05:00