Commit Graph

7166 Commits

Author SHA1 Message Date
Hornygranny 955847de74 defines 2014-10-31 19:00:50 -07:00
Hornygranny 5815d7e011 grilles are now damaged by thrown items
disposalpipes deconstruction
atmos pipes deconstruction
2014-10-31 18:26:42 -07:00
Hornygranny c29526ee2f destruction proc, cable deconstruction 2014-10-31 17:01:28 -07:00
paprka df289b5c53 Merge branch 'master' of https://github.com/tgstation/-tg-station into defibsfinal
Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm
2014-10-31 10:28:57 -07:00
paprka 393dcaade7 changes scrub spawn to one of each instead of RNG 2014-10-30 20:28:26 -07:00
paprka 389e0e1237 research design and origintech update 2014-10-30 19:21:58 -07:00
xxalpha b9f5947f5e High-traction Floor 2014-10-31 01:50:31 +00:00
Menshin 6176ee9f0f conflicts fixing 2014-10-31 02:43:00 +01:00
Menshin cce46b39eb Fixes runtimes related to clown_ore -> bananium changes (fixes #5554).
Fixes runtimes related to security records (fixes #5552).
Changing the name in the security database now also change it in the general database.
2014-10-31 02:30:34 +01:00
paprka 0296e7634a lots of debugging, ghost notifications work now 2014-10-30 17:32:19 -07:00
Hornygranny 9c95842adf Merge remote-tracking branch 'remotes/upstream/master' into OOPgularity2
Conflicts:
	code/game/turfs/simulated/floor.dm
2014-10-30 17:26:25 -07:00
tkdrg 0bb462e857 Fixes botcall conflicts, removes even more cruft and unused code 2014-10-30 20:36:30 -03:00
tkdrg 9526b8804b Merge remote-tracking branch 'upstream/master' into attackoftheturfs 2014-10-30 19:35:03 -03:00
paprka 920739c8ab defibrillators initial commit 2014-10-30 14:53:51 -07:00
Incoming d2982a4b8e Adds drones, blobbernauts, magicarp, and chaos magicarp to the staff/wand of change
Makes it so player controlled mobs with a ranged attack can actually use said ranged attack
Fixes #5551 because it's vaguely magic related anyways
2014-10-30 14:29:06 -04:00
Remie Richards dfda08cc63 Merge branch 'master' of https://github.com/tgstation/-tg-station into DiseaseRework
Conflicts:
	code/game/machinery/bots/medbot.dm
2014-10-30 06:32:13 +00:00
Remie Richards fa184f5487 Cuts /disease variables from 28 to 23 (includes new ones)
a disease may now have more than one spread type
added "infectivity" variable which replaces a prob(65), defaults to 65
affected_species is now viable_mobtypes, and lists typepaths, this is due to us actually having a species system now so it's confusing
adds defines for a bunch of stuff
2014-10-30 06:21:14 +00:00
MrPerson d14d5ac6a1 Make buckled mobs anchored if their chair is anchored 2014-10-29 22:56:11 -07:00
tkdrg 7db4f1f9a2 Fixes chat channel bugs, removes PDA authentication because apparently our players are too dumb to not share passwords between ss13 and banking accounts 2014-10-29 23:00:23 -03:00
xxalpha 1ae24af71e Added reagents to some cigarette packs 2014-10-30 01:03:51 +00:00
xxalpha 7803f296ba New Cigarette Packs 2014-10-30 00:08:14 +00:00
tkdrg cc96d09843 Adds NTRC help screen, fixes PDA /join bug that let you join multiple times without updating chat_channel 2014-10-29 20:50:08 -03:00
tkdrg 571a0953b4 Fixes chatroom runtime (thanks Gun Hog!), auto-adds # if the channel does not contain it already, obsoletes /new (its functionality is now included in /join) 2014-10-29 20:17:16 -03:00
tkdrg ab6ca61e2a Lets AIs and pAIs use the chatroom function in their built-in PDAs. 2014-10-29 19:32:23 -03:00
GunHog a216b7024e Merge remote-tracking branch 'remotes/upstream/master' into AI_Radio
Conflicts:
	code/modules/mob/living/silicon/ai/ai.dm
2014-10-28 23:53:26 -05:00
tkdrg 90d9dddf39 Merge remote-tracking branch 'upstream/master' into hiasl
Conflicts:
	code/modules/client/client procs.dm
2014-10-29 01:27:08 -03:00
tkdrg 3a862deb6b Adds chatroom logging (both admin and IC). 2014-10-29 01:20:53 -03:00
Cheridan 1aef19c835 Merge pull request #4974 from GunHog/Botcall_TG_Edition
Botcall, TG edition!
2014-10-28 22:17:35 -05:00
paprka 1b91ab24ce Improves mining equipment locker and rewards system, and buffs kinetic accelerator 2014-10-28 15:42:55 -07:00
Hornygranny cc21fd1e70 Merge remote-tracking branch 'remotes/upstream/master' into OOPgularity2
Conflicts:
	code/modules/mob/living/carbon/human/human.dm
2014-10-28 15:27:46 -07:00
Remie Richards 07ff02b7c4 Merge pull request #5477 from MrPerson/space_movement_jam
Space movement rewrite to allow everything to drift
2014-10-28 22:15:05 +00:00
Francis Devine 826d81555e Delete changelog and remove unused on variable 2014-10-29 09:04:34 +13:00
paprka 635458446a fixes compile errors by assigning proper target for checks 2014-10-28 09:51:36 -07:00
paprka b0be021739 fixes telebaton stunning borgs 2014-10-28 09:03:46 -07:00
GunHog 19ab2c4a2b Logic fix + Tweaks
- Corrects the logic for when the AI can speak on its radio.
- Added a missing "-" to the radio instructions.
- Removed an unneeded feedback line for toggling the AI's radio via
intellicard.
2014-10-28 10:23:56 -05:00
MrPerson e9f6e5d17d Added a changelog entry
Also fixed the chair-diagonal drifting bug somehow
2014-10-28 07:37:31 -07:00
Remie Richards f89e563584 Text formatting 2014-10-28 04:07:24 +00:00
Remie Richards 9e2b813fac /acid type reagents now deal damage to limbs individually, stopping if opposed by a piece of clothing.
Pieces of clothing now reduce in protection when surviving an acid attack.
added a potentially useless helper.
2014-10-28 03:55:21 +00:00
Hornygranny 5b2c635710 items thrown at size 7, floor tiles pulled up at size 5, floors ripped into lattices at size 9 2014-10-27 20:29:41 -07:00
paprka 5599d9b2b7 advanced mop cleans twice as fast as the normal mop 2014-10-27 19:04:01 -07:00
Hornygranny 68ca3ad091 projectiles no longer anchored, spawns off throw 2014-10-27 18:00:35 -07:00
Hornygranny 2c5f8e7045 obj/item is now thrown at the singularity when it's >= 5 size 2014-10-27 17:47:34 -07:00
Hornygranny 0d6d7b00ef not gonna work 2014-10-27 17:00:44 -07:00
Hornygranny 264c25b892 makes the singularity's pulling OOP with the magic of atom proc 2014-10-27 16:43:35 -07:00
paprka 7c9b23024a readds holosign to janicloset by default 2014-10-27 11:55:33 -07:00
paprka 2ee042b587 removes meme 2014-10-27 11:29:39 -07:00
hornygranny b2b0bec539 Merge pull request #5433 from phil235/WrapperFixes1
Wrapping papers fixes
2014-10-27 10:18:31 -07:00
hornygranny 7eec063785 Merge pull request #5479 from Cheridan/rip_scratch
Adds Doc Scratch costume in reverse.
2014-10-27 10:08:47 -07:00
tkdrg b0db18234f Makes pull into a mob verb. 2014-10-27 12:28:06 -03:00
tkdrg 0a47c8ec4e You can no longer put transit tube pods in a station that already has one. 2014-10-27 11:55:46 -03:00