Commit Graph

2911 Commits

Author SHA1 Message Date
Giacomand 7319456770 MiniStation Update
Fixes a runtime with the vent clogging event, which happens to MiniStation.
Lowered all vent requirements to 20.
Fixed transit tubes from breaking by reversing the pod direction twice.
Changed the icon state name of the terminators so that they had density.
Transit tubes will now reset the view of the mob exiting.
2014-02-05 22:04:58 +00:00
fleure 26afced91b Merge pull request #2629 from Giacom/master
MiniStation Update
2014-02-05 18:38:03 +00:00
fleure fd81304128 Merge pull request #2612 from Mercenaryblue/master
The LaserTag update: Part one
2014-02-05 18:31:08 +00:00
Mercenaryblue c3a2861bf8 Update fitness.dm
Extra kits in the lockers
2014-02-04 21:53:17 -05:00
Razharas 061b6aab4a Merge pull request #2607 from adrix89/Fix_1653
Fix 1653
2014-02-04 17:40:30 -08:00
Giacomand b8329e7f2b Fixed a few map bugs on MiniStation.
Added the missing mini-hoe and hatchet to the garden area.
Added reverse stations which will send pods in the opposite direction, after their stop.
Added tube terminators for you to put on the end of non-looping tubes.
2014-02-04 20:13:07 +00:00
adrix89 ba1c517ad1 Grill bugfix 2014-02-04 11:49:22 +02:00
Mercenaryblue 35976a9cf8 Update fitness.dm
Adds LaserTag helmets to fitness lockers.
2014-02-03 23:02:12 -05:00
Cheridan ad235cf18f Merge pull request #2563 from Razharas/NewTables
New PR for crafting tables
2014-02-03 08:46:56 -08:00
fleure 97b99e47f6 Merge pull request #2558 from MrPerson/rollerbeds
Fixes rollerbeds and their offsets so they don't look stupid.
2014-01-31 14:13:51 -08:00
Razharas b4f011bacb Merge branch 'master' of https://github.com/tgstation/-tg-station into CraftingTable
Conflicts:
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/power/cable.dm

Fixing conflicts
2014-01-31 05:20:59 +04:00
fleure 6c07d2bae2 Merge pull request #2549 from Incoming5643/PussyGalore
Fixes the fucking cat crate jesus christ goddamn
2014-01-30 14:56:50 -08:00
Incoming a8aff5e534 Fixes the Fix, wouldn't want people getting two corgis for the price of one, no that'd be terrrrrrrible 2014-01-30 10:52:32 -05:00
MrPerson b4d2ba33cb Fixes rollerbeds and their offsets so they don't look stupid. 2014-01-30 06:02:46 -08:00
Incoming 40cd679747 Fixes Cat Crates, Corgi Crates and Chick crates.
File bug reports you guys, seriously.
2014-01-29 19:20:26 -05:00
Razharas 3023f12ff9 Returned to the forces of light thanks to gia
No more text paths, only normal paths
2014-01-26 05:42:34 +04:00
Ergovisavi 45cfb68ac5 Merge branch 'master' of https://github.com/tgstation/-tg-station into Miningmobs 2014-01-24 23:12:01 -08:00
Razharas c17de66cbc Added chem handling and IED recipe
Uh oh
2014-01-24 03:55:09 +04:00
Ergovisavi 3b6208eae1 Replaced wall_smash in simple_animal with environment_smash, because before, you either tables AND walls, or nothing. If set to 1, smash crate/locker/rack/table, 2 for wallsmash, 3 for rwall smash
Hostile mobs with environment smash will also unbuckle themselves by destroying whatever they're buckled to when angered.
2014-01-22 20:37:47 -08:00
Razharas 2717aed93c Some recipes and addable parts
Indeed
2014-01-23 04:07:28 +04:00
Miauw 4bdffc2dc3 Merge branch 'master' of https://github.com/tgstation/-tg-station into somebodyfinallydoessomethingaboutnewlingsuckingpleaselickmyfeetnow
Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
2014-01-22 17:01:20 +01:00
Razharas e1d14793a0 Return to the text paths
Yes byond doesnt let me use normal paths as association for numbers
2014-01-22 07:51:11 +04:00
Razharas ea54257ab6 Ported cable coils to stacks crudely
Yeah
2014-01-22 02:11:19 +04:00
Razharas bab69a6bf8 Added tools and time handling
Well yeah
2014-01-22 02:11:17 +04:00
Razharas 1c394dd334 Implemented crude crafting
Debug messages are still inside, pushing only cozx pete asked me to
2014-01-22 02:11:16 +04:00
Pete Goodfellow e8ed1a83f7 Merge branch 'master' of github.com:tgstation/-tg-station into waistcoat2
Conflicts:
	code/game/objects/structures/crates_lockers/closets/job_closets.dm
2014-01-20 19:29:47 +00:00
Miauw 13b3cd69f2 Adds changeling arm blades that can slice tables apart and break computers and generally be robust. 2014-01-19 18:33:03 +01:00
Pete Goodfellow 5222191b73 Changes the waistcoat path from /obj/item/clothing/suit/wcoat to /obj/item/clothing/tie/wcoat so you can wear it under a spacesuit or suit jacket.
Also makes ties show up on the jumpsuit object.
2014-01-19 14:50:27 +00:00
John Smith a3e94d74e9 Black Baseball Caps [FIXED] 2014-01-19 00:35:10 -08:00
Aranclanos db9a20ad6e Mineral doors won't close anymore if there's a mob under them. Even a butterfly.
Mineral doors will now update the air when closing and opening. No more magic air shields from here.
2014-01-15 19:54:27 -03:00
Incoming 03464e1f4d Slime Mob Refactor
Death of the istype invasion from slimes, previously every single color of slime was its own kind of mob, and every single one of those slimes also had an adult form which was a different mob.

There is now only one kind of slime, reliant on new var is_adult and old var colour to determine how it looks. All baby slimes functioned identically outside of icon and core, and all adult slimes functioned identically to each other and to the babys save for a bit higher Health and more capacity to break shit.

A nice side effect is that this solves any inheritence issues of baby slimes growing up since it's still the same mob, though it doesn't solve the same issues for adult slimes splitting.

Also fixed a few annoying but rare bugs (like getting ghosted because you got DC'd and your slime self split and you weren't around to get mind transfered)
2014-01-13 19:38:37 -05:00
Giacom c8120da49c Merge pull request #2283 from YotaXP/list2text-refactor
Optimized and refactored list2text, text2list, and replacetext.
2014-01-11 10:11:13 -08:00
Giacom 4304107d26 Merge pull request #2242 from ChuckTheSheep/Morgue-Changes
Morgue Changes
2014-01-10 08:19:33 -08:00
Aranclanos 769e9dd9a7 Merge pull request #2137 from Rumia29/23/12/2013-rdaltuniform
Adds an alt RD uniform to the RDs locker
2014-01-10 00:52:09 -08:00
Aranclanos 3d6eb6dd3d Fixed tables not working 2014-01-09 18:54:54 -03:00
ChuckTheSheep 8e050332d6 Cleans up the for() and list handling in update. 2014-01-08 18:12:17 -05:00
YotaXP f98a57b750 Optimized and refactored list2text, text2list, and replacetext.
Also fixed some grammar in the station blueprint code.
2014-01-07 22:15:25 -05:00
ChuckTheSheep 1d7858d54f Fixes regarding path case 2014-01-06 18:01:28 -05:00
Cheridan 58159a00ad Merge pull request #2105 from RobRichards1997/20/12/2013-Poker_Tables
Poker tables
2014-01-06 14:35:03 -08:00
ChuckTheSheep e97ce3edfa Moved on_login() now named on_log() 2014-01-05 20:49:36 -05:00
ChuckTheSheep 072b78876f Merge branch 'Morgue-Changes' of https://github.com/ChuckTheSheep/-tg-station into Morgue-Changes 2014-01-05 20:36:10 -05:00
ChuckTheSheep 5cda0c140e Forgot Crematorium Changes - Whoops 2014-01-05 20:35:57 -05:00
Cheridan bf9fa21ddc Merge pull request #2149 from Miauw62/kittens
Kittens!!!! !!! !! !! !!!!!! !
2014-01-04 20:21:15 -08:00
Cheridan e71314d4eb Merge pull request #2199 from Perakp/buckleFix
Buckle fix
2014-01-04 19:51:59 -08:00
ChuckTheSheep d1eb240c33 Whoops 2014-01-04 21:22:31 -05:00
ChuckTheSheep 9bff642d14 Genocide of the Colons 2014-01-04 21:21:42 -05:00
ChuckTheSheep f03d2be397 Morgue Changes
Crematorium lights up when cooking.
Morgue slabs change light color depending on what is inside.
Red = dead body, orange = no body but items, green = client connected
body.
Updates when open or closed, and when ghosts/re-enters body inside.
2014-01-04 19:50:13 -05:00
Miauw 61ed6a5e15 Merge branch 'master' of https://github.com/tgstation/-tg-station into kittens
Conflicts:
	code/modules/mob/living/simple_animal/simple_animal.dm
2014-01-03 19:27:51 +01:00
Cheridan 3a11af405c Merge branch 'master' of https://github.com/tgstation/-tg-station into pr/2192
Conflicts:
	code/modules/clothing/head/misc.dm
2014-01-02 10:00:58 -06:00
Perakp ac9228bae1 Added an else message to make it clear you can't unbuckle while buckled.
Refractored code to reduce copypasta.
2014-01-01 11:31:15 +02:00