Commit Graph

67 Commits

Author SHA1 Message Date
AnturK a44f985566 Fixes dark wishgranter not killing faithless properly 2016-01-23 21:50:53 +01:00
MMMiracles 8b13e0cfdd i love map conflicts 2016-01-21 01:20:25 -05:00
MMMiracles af5f726089 lodesmapedits 2016-01-21 01:07:06 -05:00
Bjorn Neergaard 1c34479376 Fix uplink code once and for all
Fixes #14733
2016-01-19 16:42:57 -06:00
Bjorn Neergaard b33c6f216d Tidy tooltips; hide lock button from non-lockable uplinks 2016-01-18 14:27:34 -06:00
Bjorn Neergaard ff5d6292c8 tgui uplinks; repath uplinks 2016-01-18 14:22:00 -06:00
tkdrg bff752a69a Merge pull request #14513 from KorPhaeron/why
Removes teleport scroll from snowdin
2016-01-09 12:39:23 -03:00
KorPhaeron 7bafb9e1fd Snowdin 2016-01-08 07:37:57 -06:00
Tkdrg 5589ac7559 Revert "Merge pull request #12935 from AndrewJacksonThe2nd/objectives_rework"
This reverts commit 52a45b6292, reversing
changes made to 19b43ba668.

Conflicts:
	code/datums/mind.dm
2016-01-07 23:15:35 -03:00
tkdrg 926fe760b6 Merge pull request #14286 from KorPhaeron/cheribucks_secured
Fixes away mission area names
2016-01-03 02:58:22 -03:00
MMMiracles 1171d9d3fc spellingishard 2016-01-02 00:59:53 -05:00
KorPhaeron 9466b33819 Fixes the other away missions 2016-01-01 23:49:42 -06:00
KorPhaeron 7ccce98b6e CHERIBUCKS 2016-01-01 23:45:19 -06:00
MMMiracles 2be090aee1 Merge branch 'master' of https://github.com/tgstation/-tg-station into geneticsishard 2016-01-01 15:03:45 -05:00
tkdrg 0d0210c951 Merge pull request #14197 from KorPhaeron/snowdin
Allows ghost spawners to implant the new mob
2016-01-01 16:31:53 -03:00
KorPhaeron 9c8a0cb0a5 Implant 2015-12-31 10:47:33 -06:00
AndrewJacksonThe2nd dca91323a4 Merge branch 'master' of https://github.com/tgstation/-tg-station into objectives_rework
Conflicts:
	code/datums/mind.dm
	code/game/gamemodes/antag_spawner.dm
	code/game/gamemodes/objective.dm
	data/mode.txt
2015-12-28 12:40:51 -08:00
MMMiracles 1c1e892ddf New Away Mission: Research Facility 2015-12-22 17:34:04 -05:00
MMMiracles 55ebaf3bdb snow stuff i guess 2015-12-15 17:33:34 -05:00
MMMiracles d07f300063 i did things 2015-12-15 16:46:24 -05:00
MMMiracles b3d992a832 conflict fix 2015-12-11 16:21:18 -05:00
MMMiracles d61d655076 oh my 2015-12-10 23:14:42 -05:00
Cheridan f29336a4f8 Merge pull request #13470 from AnturK/academytwo
Academy Fixes & Upgrades.
2015-12-08 22:25:05 -06:00
MMMiracles f222dfe36e mostly final changes, wowzers 2015-12-08 21:20:31 -05:00
MMMiracles c384aae4c3 more map edits, loot table balancing, bug fixes, also ATV VROOM VROOM 2015-12-08 00:43:53 -05:00
MMMiracles 81f6c450e5 fianl stuff for now, testing!!!!! 2015-12-06 14:32:10 -05:00
AnturK 1b09b3503d Adds internals box to Academy Defender outfit 2015-12-06 14:16:09 +01:00
MMMiracles f8ab62e92e finalization of the topside part, time to make dungeon designs woo 2015-12-06 01:13:17 -05:00
Nerd Lord 58a3f742c6 Spawnable hostile constructs, for away missions and adminfuckery. 2015-12-05 10:48:52 -05:00
MMMiracles 8ab579cb21 Merge branch 'master' of https://github.com/tgstation/-tg-station into snowiscold
Conflicts:
	icons/mob/animal.dmi
2015-12-04 18:55:10 -05:00
MMMiracles 77b36e2415 iced windows, more ice variants of shit in general.
more stuff, ice everything.

wew

conflict fix
2015-12-01 16:45:09 -05:00
Cheridan 4f38906dd5 Merge pull request #13311 from KorPhaeron/wild_west
Fixes wild west windows
2015-11-30 07:12:05 -06:00
KorPhaeron 0f2eee4e17 Cleans up meatgrinder code 2015-11-29 18:30:34 -06:00
MMMiracles f67dde21d5 foundation set, demands given. 2015-11-29 12:34:49 -05:00
AnturK 9a434b669c Academy Fixes 2015-11-28 23:17:57 +01:00
AnturK b662b470a9 Enables ghost to go through ladders
Adds Cold snow turf
Adds Infinite Candles
2015-11-28 18:14:52 +01:00
AnturK b14e9133d2 Academy Update 2015-11-28 12:35:41 +01:00
AndrewJacksonThe2nd eaa1d11af4 On stun_nerf: objectives 2015-11-08 21:10:21 -08:00
KorPhaeron 714dba55b5 Fixes energy cannons 2015-10-26 19:35:14 -05: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
Shadowlight213 cfdea80afa Fixes Meat grinder and immortality from the Wild West away mission. 2015-10-11 23:59:22 -07:00
phil235 f90ee4aa8c - Fixed monkey starting with no dna.
- Fixed bugs with monkeyize/humanize: 7803 (humanized monkey nobloodtype)
- Fixes 9298 monkeyed ling have troubles humanizing themself (already fixed?)
- Fixes despawning clothes when monkeyizing. 11855
- Replaced check_dna_integrity proc by simpler has_dna proc when required.
- created set_species() proc
- fixed space retrovirus not transfering SE (despite having a domutcheck()). Still need to check if it needs a name = real_name.
- I renamed mecha/var/dna to dna_lock to avoid confusion
- I renamed an armor var in a species proc to armor_block to avoid confusion with species/var/armor.
- I removed many if(dna) checks in lots of files.
- I removed duplicate defense procs between human/proc/X and dna.species/proc/X since dna is now always set.
- Anatomic panacea from changeling removes alien embryo correctly. 6247
- Fixes runtime when trying to put dna-less brain mmi into a dnalocked mech.
- Removed carbon/var/list/features, we now only have dna.features and prefs.features
- Remove hulk mutation from lizards and other species (Fixed 6413); only real humans can acquire hulk. (less work on sprites for each ones, fixes lizard tail not in hulk color)
- Fixes cloning not setting up correctly dna UE and dna.real_name
- I fixed the issue with sucked+cloned ling being unable to absorb
- I fixed issue with changeling proc checking if they have the dna already not working.
- Fixed 4095, low health hulk with DAA getting stuck in loop of acquiring/losing hulk.
- I added a second layer for mutations to differientate mutations that go below and above the body layer (Fixes 7858)
- Fixes 10048, the transform to initial appearence button was fucking up the dna.

- Fixes cloning not setting up correctly dna UE and dna.real_name
- Fixed the issue with sucked+cloned ling being unable to absorb
- Fixed issue with changeling proc checking if they have the dna already not working.
- Fixed 4095, low health hulk with DAA getting stuck in loop of acquiring/losing hulk.
- Added a second layer for mutations to differientate mutations that go below and above the body layer (Fixes 7858)
- Fixes 10048, the transform to initial appearence button was fucking up the dna.
2015-09-19 22:18:28 +02:00
bear1ake f697ae90f5 removes a bunch of .0 2015-09-10 20:57:30 +09:00
Firecage 4688c2c969 Fixes proc arguments 2015-07-15 23:52:35 +02:00
Incoming f59c01e721 sets hardset_dna to clear exotic blood on race changes
sets every instance of race changes to use hardset_dna instead of directly replacing the datum (needs more testing to be sure I didn't break shit)
removes the invisible man race (aka the generic) and shadowlings from the new green slime mutation toxin while I'm in the area
2015-04-23 12:35:37 -04:00
kingofkosmos 2e4a8fcce8 Recieve --> receive grammarfix
Changes all "recieve"s in descriptions around the tgstation to "receive". Also energy katana description high priority fix.

Fixes #8576
Fixes #8504
2015-04-03 19:42:34 +03:00
Razharas 76a21883a8 Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit
Conflicts:
	code/game/mecha/mecha.dm
	code/game/objects/structures/tables_racks.dm
	code/modules/mob/living/silicon/silicon.dm
	code/modules/projectiles/gun.dm

Fixes dem conflicts
2014-12-28 11:20:15 +03:00
Razharas 208b59c30e Fixed stuff tkdrg pointed out
Added comment to dualsaber and hulk checks to explain whats going on
Added defines that converts to mutation names
Fixed grammer again
2014-12-28 10:49:04 +03:00
Hornygranny cd22bfc11f refactors narsie to use the object oriented programming meme 2014-12-18 11:44:20 -08:00
Razharas f0c8f2eeac Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit
Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm

conflicts resolution
2014-12-16 02:52:08 +03:00