Commit Graph

682 Commits

Author SHA1 Message Date
Incoming 1f9f0dfc40 Adds subtypesof(). It's shorthand for typesof(path) - path.
Replaces typesof(path) - path with subtypesof(path) in obvious places. I was a bit conservative, there's probably a few more places that could use this.
2015-11-16 18:55:57 -05:00
Razharas 7489f929f2 Merge pull request #12964 from GunHog/Nanotrasen_Pindication
Reduces Loyalty Firing Pin tech requirement
2015-11-17 00:59:41 +03:00
Tkdrg 8c694d9fc0 R&D and Misc Fixes/Tweaks
Fixes invisible gasmask exploit.
Fixes mineral duplication exploit in protolathe.
You can no longer break a RD Console while a linked machine is busy.
Adds cancel button to admin Send To.

Fixes #12729
Fixes #12197
Fixes #11741
Fixes #11449
2015-11-14 13:35:05 -03:00
as334 a6eaf76d72 Fixes merge conflicts, adds new sprites, hopefully fixes weird helmet sprite bug. 2015-11-12 21:54:08 -05:00
GunHog a7bc20cba7 Reduces Loyalty Pin tech requirement
- Loyalty pins now require Combat 5 instead of 6.
- Loyalty pins can now be replaced by other pins.
2015-11-11 09:43:19 -06:00
Aranclanos d454eae1b1 Merge pull request #12916 from tkdrg/ripinpiss
Removes PDA chatrooms
2015-11-09 02:56:41 -03:00
Tkdrg 20fe2e4bb5 Removes PDA chatrooms
Nobody used them, and they were cluttering PDA Topic() needlessly.
Rest in peace, my child. You were too good for this world.
2015-11-07 23:51:48 -03:00
Tkdrg 8fce742d0a Merge remote-tracking branch 'upstream/master' into fuk
Conflicts:
	data/mode.txt
	icons/mob/mob.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/gloves.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/shoes.dmi
	icons/obj/clothing/suits.dmi
2015-11-07 15:56:39 -03:00
Razharas 9e69eafef1 Merge pull request #12836 from KorPhaeron/chill
New dark blue slime reaction (fireproofing potion)
2015-11-06 19:42:17 +03:00
KorPhaeron eaf87bb7f9 Burn state 2015-11-05 08:06:39 -06:00
KorPhaeron 6f76380705 New dark blue slime reaction 2015-11-03 04:26:58 -06:00
KorPhaeron e60d0f9203 Fix for jordie 2015-11-02 00:43:33 -06:00
Tkdrg e2187614fd Merge remote-tracking branch 'upstream/master' into hog-mergeconflicts
Conflicts:
	code/__DEFINES/hud.dm
	code/__HELPERS/game.dm
	code/_onclick/hud/_defines.dm
	code/_onclick/hud/hud.dm
	code/game/gamemodes/antag_spawner.dm
	code/game/gamemodes/game_mode.dm
	code/game/machinery/turrets.dm
	code/modules/client/preferences_toggles.dm
	code/modules/events/alien_infestation.dm
	code/modules/mob/dead/observer/observer.dm
	code/modules/mob/living/carbon/alien/special/alien_embryo.dm
	code/modules/mob/living/simple_animal/revenant/revenant.dm
	icons/mob/back.dmi
	icons/mob/head.dmi
	icons/mob/hud.dmi
	icons/mob/inhands/items_lefthand.dmi
	icons/mob/inhands/items_righthand.dmi
	icons/mob/mob.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/items.dmi
	icons/obj/projectiles.dmi
	icons/obj/storage.dmi
2015-11-02 01:06:30 -03:00
KorPhaeron e5f59edfae Xenobio fixes 2015-11-01 21:05:06 -06:00
KorPhaeron 86b966e64f Fix 2015-11-01 14:19:57 -06:00
KorPhaeron 36d747acb6 Xenobio cam fix 2015-11-01 09:36:06 -06:00
KorPhaeron 5a781f93df Merge remote-tracking branch 'refs/remotes/tgstation/master' into xenobiology2 2015-10-31 21:47:10 -05:00
KorPhaeron 8b2fec9281 Icons, monkey recycle 2015-10-31 17:56:29 -05:00
Razharas aa3198afd1 Merge pull request #12749 from GunHog/This-is-why-you-remember-to-SYNC!
Missing Diagnostic HUDs commit
2015-10-31 21:37:29 +03:00
Razharas f78289c60e Merge pull request #12716 from GunHog/Charge-ALL-The-Guns!
Buildable Rechargers!
2015-10-31 05:10:04 +03:00
KorPhaeron d87803fdb4 Slime blueprints 2015-10-30 04:42:20 -05:00
KorPhaeron d41c7bf8f0 Fix 2015-10-30 04:28:22 -05:00
KorPhaeron 53cdf169e1 Xenobio control 2015-10-30 03:53:18 -05:00
GunHog 336b57bd5a Missing Diagnostic HUDs commit
For some reason, the final commit for DiagHUDs was lost. This adds
Diagnostic HUDs to roboticist lockers, the protolathe properly, fixes
the night HUD's onmob sprite and adds a quick changelog.
2015-10-30 00:45:31 -05:00
Razharas fc0ea9311b Merge pull request #12614 from GunHog/Diag_Huds
Diagnostic HUDs
2015-10-30 06:25:48 +03:00
GunHog f0f16426b9 Gold requirement
- Circuit board design now requires gold.
- Origin and Required tech levels made consistent with a board that
takes gold.
2015-10-29 08:20:32 -05:00
GunHog ea36718bc3 Buildable Rechargers!
- Rechargers can now be constructed/deconstructed as a machine. Requires
the board and a capacitor.
- Rechargers can now be upgraded with superior capacitors to increase
recharge rates!
2015-10-28 14:55:38 -05:00
Kyle Spier-Swenson 77db6d2dd4 Golem runes no longer trigger on ghosts orbiting something
This can be annoying when you are orbiting someone and they walk over a golem rune.

It also could be used to tell who ghosts are orbiting, also bad.
2015-10-27 07:45:03 -07:00
Razharas e0ab2b582c Merge pull request #12495 from Anonus/switchblades
Massively buffs timestop effects
2015-10-27 13:58:11 +03:00
Razharas 9c78cc9e56 Merge pull request #12584 from KorPhaeron/redunzgofastah
New red slime speed potion
2015-10-27 13:57:13 +03:00
KorPhaeron 7de9f6cc68 Clean 2015-10-25 23:54:51 -05:00
KorPhaeron 76f198a3f6 Runtime 2015-10-25 19:25:07 -05:00
as334 f116ba5c32 Merge branch 'master' of https://github.com/tgstation/-tg-station 2015-10-25 15:39:42 -04:00
GunHog b10850718a Merge remote-tracking branch 'remotes/upstream/master' into Diag_Huds
Conflicts:
	code/modules/mob/living/silicon/robot/robot.dm
2015-10-23 18:53:30 -05:00
GunHog d37805e093 Adds HUD items
- Adds Diagnostic HUD to Sci
- Adds NV Diagnostic HUD as well
2015-10-23 14:19:17 -05:00
Cheridan 6bfa738a24 Merge pull request #12567 from phil235/EffectSystemTweak
Makes effect system code more OOP.
2015-10-22 21:00:10 -05:00
KorPhaeron 154a706518 Red paint 2015-10-22 02:18:12 -05:00
phil235 fb7ad8b38f Merge pull request #12452 from Xhuis/radical
Radiation tweaks and a geiger counter
2015-10-22 01:13:00 +02:00
phil235 d3ee910211 Makes effect system code more OOP.
obj/effect/effect is now renamed obj/effect/particle_effect for better usability.
datum/effect/system and /datum/effect/effect/system are now both /datum/effect_system.
Fixes a bug where wall mounted igniters (and other spark producing objects) didn't produce sparks sometimes.
Moved explosion_particles.dm into the effect_system folder, because it has effect_systems code.
2015-10-21 23:28:29 +02:00
as334 42971f8fd6 Merge https://github.com/tgstation/-tg-station 2015-10-20 16:51:24 -04:00
Razharas 4bd2956c6b Merge pull request #12466 from phil235/BugFixBoogalooH
Bugfixes: soulstone, reagent runtimes, etc
2015-10-19 10:02:42 +03:00
Nerd Lord a2114ca5ad You can no longer click on the timestop effect itself. 2015-10-18 21:08:24 -04:00
phil235 79a814b434 Fixes some runtimes when picking candidates for certain simple_animals, especially sentience potion. If the player chose 'Yes' and then immediately disconnected, it would make the chosen client null. Same thing for xeno larva bursting (player disconnection mid bursting animation)
Fixes runtimes with chem grenade calling prime() after being GC'd.
Fixes some hardsuits having "unacidable = 1" twice.
Fixes runtime with alien whisper.
Fixes runtime with check_shields()
Fixes runtime with Venom, Formaldehyde, corn syrup and holy water.
Fixes cult sacrifice soulstoning not working (giving a dead shade).
2015-10-18 01:28:48 +02:00
Cheridan cb7642b969 Merge pull request #12417 from phil235/SmokeChange
Changes smoke to behave more like foam.
2015-10-17 10:07:04 -05:00
Xhuis 2891ba53be Adds the counters into the game 2015-10-16 23:20:14 -04:00
Razharas 52a82ff165 Merge pull request #12396 from Steelpoint/RiflesMan
Auto Rifle Balance Changes
2015-10-16 20:07:46 +03:00
as334 bc9b2484d7 Initial Commit 2015-10-15 22:43:05 -04:00
phil235 47909d525f Changes smoke to behave more like foam. Each covered tile has one smoke cloud. This makes smoke clouds much less random, especially in terms of reagent application.
Also smoke reaction now uses the TOUCH method instead of VAPOR, to differentiate smoke and foam. Mob without internals or gas masks also ingests reagents in the smoke.
Moved nanofrost smoke code to effects/effect_system/effects_smoke.dm
2015-10-15 21:52:37 +02:00
Steelpoint 0070b9911d InitalCommit 2015-10-15 01:51:54 +08:00
Remie Richards 58e6c40e16 Merge pull request #12322 from phil235/ExperimentorThrowFix
Fixes experimentor throwing stuff around one item at a time instead o…
2015-10-13 23:10:13 +01:00