Commit Graph

13677 Commits

Author SHA1 Message Date
phil235
bd189431d0 Merge pull request #7002 from Menshin/gunlights_runtimes_fix
Fixes "Toggle Gunlight" verb runtimes
2015-01-14 17:29:15 +01:00
MrPerson
85b277c404 Merge pull request #7011 from Firecage/Blubbery_be_gone
This fixes that "You suddenly feel blubbery" message spam.
2015-01-14 02:12:28 -08:00
tkdrg
e7172f458d Merge pull request #6998 from optimumtact/patch-3
Reorder error check for manifest length
2015-01-14 03:25:24 -03:00
tkdrg
8c0e20f31c Merge pull request #6994 from Boggart/mechcontrolconsolefix
Fixes incorrect icon for exosuit control console.
2015-01-14 03:09:18 -03:00
tkdrg
82bff079c7 Merge pull request #6137 from Iamgoofball/byond
Goon Chemistry [FINISHED]
2015-01-14 02:31:56 -03:00
Iamgoofball
fecaa06cff removes getTotalLoss() for REAL THIS TIME 2015-01-13 21:02:37 -08:00
Iamgoofball
57ad61f75f removes scrollbar from chemdispenser nanoui menu due to new chems 2015-01-13 20:56:39 -08:00
Iamgoofball
a70cfc4c86 fixes medipens even more 2015-01-13 20:49:54 -08:00
Iamgoofball
e8217f7eae fixes medipens more 2015-01-13 20:46:38 -08:00
Iamgoofball
b80723265d Adds an extra chemical, tweaks, fixes, changes to be more accurate to Goonchem. 2015-01-13 20:24:11 -08:00
Iamgoofball
8e9c008030 forgot to end a span class 2015-01-13 19:08:07 -08:00
Iamgoofball
8b39dec424 span classes 2015-01-13 19:06:41 -08:00
tkdrg
d10364797a Merge pull request #6981 from dannno/bandanno's
Bandanas/More jumpsuits in mixed fixed
2015-01-13 21:49:47 -03:00
dannno
4bc4d44ab7 action button and headmaskform removes, terrorists win 2015-01-13 17:30:42 -05:00
dannno
555afcfb58 tkdrg's generalization suggestion no more snowflake 2015-01-13 17:16:41 -05:00
dannno
5dc6f1449f when in hat form, bandanas can be added to head slot
fixed the admins.txt nonsense
2015-01-13 15:41:45 -05:00
Swag McYolosteinen
430b613ef4 Merge pull request #6984 from tkdrg/sanitaiz
Replaces a bunch of input() with stripped_input()
2015-01-13 19:32:25 +01:00
Firecage
4ee6fb9157 This fixes that "You suddenly feel blubbery" message spam. 2015-01-13 11:53:23 +02:00
Cheridan
ab7992d1f3 Merge pull request #6965 from paprka/nomoredirt
Removes roundstart dirt from many areas
2015-01-13 02:54:47 -06:00
paprka
3ce1bf233f fixes some compile errors with my previous PR 2015-01-13 00:45:58 -08:00
paprka
008c7129c1 fixes some mess spawners 2015-01-13 00:28:59 -08:00
Cheridan
1c090e02b7 Merge pull request #6787 from paprka/serviceandsupply
Separates supply from civilian (service) jobs
2015-01-13 02:19:30 -06:00
Cheridan
c81eada938 Merge pull request #6737 from tkdrg/hurr
Changes the practice beam name to "practice laser"
2015-01-13 02:13:38 -06:00
Cheridan
857944a6d2 Merge pull request #6959 from tkdrg/fuckingHELL
Fixes basic med hud regression bug
2015-01-13 01:59:21 -06:00
Cheridan
4cf4779596 Merge pull request #6643 from phil235/HungerNerf
Sugar nerf
2015-01-13 01:47:37 -06:00
Cheridan
4bd70b2908 Merge pull request #6986 from Menshin/ear_damage_ooping
Ear damage/deafness tidying
2015-01-13 01:19:56 -06:00
Cheridan
4141a34a4f Merge pull request #6956 from Carn/#3554
Resolves #3554 - spacevines will now spread on shuttle turfs.
2015-01-13 00:58:42 -06:00
Iamgoofball
470ef28c11 Adds a changelog and reduces drug text spam. 2015-01-12 21:12:38 -08:00
Iamgoofball
5a91ce4fee Requested changes by @Cheridan 2015-01-12 20:38:56 -08:00
Razharas
8155304d1a Merge pull request #6727 from Iamgoofball/raginmages
[READY] Blob Mania 1: Reagent Blobs, Split Personality, Storage Blobs, and Blob Broadcast
2015-01-13 06:47:40 +03:00
Iamgoofball
bf4de75646 Fixes copypasta. 2015-01-12 19:42:39 -08:00
Ergovisavi
29e1e8fe91 Merge pull request #6988 from Incoming5643/Icantcount
Magic Mania 1.82: 1 + 1 = 2
2015-01-12 19:22:07 -08:00
Iamgoofball
f527d53e3e Increases the cigarette chemical cap as per request by @Miauw62 2015-01-12 19:01:52 -08:00
Iamgoofball
4551fe664b Enables children blobs to be able to split. Public playtesting can show whether this needs to be disabled. 2015-01-12 18:43:55 -08:00
tkdrg
1493b179c7 Merge pull request #6972 from Carn/#6953
Resolves #6953 - Shuttle transparent corners now inherit a snapshot of t...
2015-01-12 23:41:07 -03:00
tkdrg
6c0ff7457a Merge pull request #6978 from Carn/#6947
Resolves #6947 - fakerecalls now work
2015-01-12 22:49:39 -03:00
Menshin
435ccf7ff9 * OOP'ed ear damages/deafness status updating
* Silicons are now immuned to ear damages/deafness
* Only living mobs can now take ear damages/be deafened
* Simple animals are now healing ear damages/deafness at the same rate as other living mobs
* Fixes being able to hear AI announcements when deaf
2015-01-13 00:40:46 +01:00
Menshin
0582d87a08 * Fixes "Toggle Gunlight" verb runtimes for guns without any light.
* The verb will now only appear if there's a gunlight attached to the gun.
2015-01-13 00:30:54 +01:00
Orange Borg
825c8d45a5 Reorder error check for manifest length
Manifests were reporting an incorret size when there were no errors in the manifest.
2015-01-13 10:37:49 +13:00
dannno
3dc5a04038 Merge branch 'master' of https://github.com/tgstation/-tg-station into bandanno's
Conflicts:
	config/admins.txt
2015-01-12 15:55:51 -05:00
tkdrg
d5950a62a4 Merge pull request #6967 from phil235/AttackHitZoneFix
Fixes two typos in ran_zone() proc.
2015-01-12 15:24:20 -03:00
Boggart
3600714480 Fixes incorrect icon for exosuit control console.
Fixes incorrect icon for powered exosuit control console, it was accidentally setting the icon state to the unpowered one.
2015-01-12 03:21:36 -07:00
tkdrg
79582b9cb1 Merge pull request #6957 from Carn/fix_supplyconsole
Fixes supplycomp
2015-01-12 02:43:54 -03:00
Iamgoofball
616d197a49 whoops, didn't mean to forget to uncomment those 2015-01-11 20:17:37 -08:00
Iamgoofball
1543abb43f Moves the core and node sprites to be overlays. Tweaks and adjustments to various reagents. Removes 2 of the reagents for being useless. 2015-01-11 20:04:24 -08:00
Incoming
2e8995dde3 Magic Mania 1.82: 1 + 1 = 2
The challenge system wasn't properly rewarding wizards who used it because it deducted a use before it was given back, meaning I made summon guns/magic free to cast but didn't actually give any benifit to doing so.

I'm going to take the fact that no one reported this bug as a pretty solid sign that people just would cast those things in either case.
2015-01-11 21:34:32 -05:00
tkdrg
3b06f37f70 Merge pull request #6955 from Carn/#3947
Resolves #3947 - Fires can now spread on shuttles
2015-01-11 21:32:21 -03:00
tkdrg
2052189655 Merge pull request #6950 from Carn/#4226
Resolves #4226 - makes Shuttle early-call/repeals less spammy.
2015-01-11 21:04:34 -03:00
tkdrg
379b7b83fc Fixes a missed variable 2015-01-11 20:00:41 -03:00
tkdrg
b852aa41ea Replaces a bunch of input() with stripped_input()
Some of these were exploitable for XSS, as well.
2015-01-11 19:02:53 -03:00