ae9e56d21f
Merge pull request #15852 from KazeEspada/Cabin
...
Cabin Away Mission
2016-03-03 22:18:12 +01:00
6d2a95eb43
Moves the mapGenerator to mapGeneratorObj.dm.
...
Cabin was given new carpets, and some fixes.
The snowy map generator now spawns bunnies.
New type of bunny that is not easter related.
Chickens now have support for no eggs.
2016-03-03 13:47:11 -07:00
7bfe258241
Cabin ready for testing commit. Cabin is mostly finished and just needs some eyes to look over it and see if I missed anything.
2016-02-29 22:47:38 -07:00
c02ccab8c0
Merge pull request #15758 from AnturK/spawners
...
Refactor of map and corpse spawners.
2016-02-29 23:44:38 -03:00
f1d903dadb
Add fireplace and a map generator. Finishes more the cabin map.
2016-02-28 14:18:08 -07:00
03c168c2b3
Begins work on Cabin away mission. Its a quiet away mission that resembles beach.
2016-02-27 17:36:09 -07:00
2dfebaa77e
Merge pull request #15708 from KorPhaeron/sins
...
Five lavaland ruins
2016-02-26 08:46:32 -06:00
5edc60ed0a
Unifies corpse spawners
2016-02-25 18:36:16 +01:00
38f3f1dada
Merge branch 'master' of https://github.com/tgstation/-tg-station into PARANOIA
...
Conflicts:
code/game/objects/items.dm
code/modules/clothing/masks/gasmask.dm
code/modules/clothing/under/chameleon.dm
2016-02-23 21:06:36 -08:00
2901f3d8f0
Merge pull request #15684 from KorPhaeron/snowdin
...
Removes die of fate from snowdin
2016-02-23 01:48:03 -06:00
d17d34edc9
Three lavaland ruins
2016-02-23 01:07:06 -06:00
72c4becd95
Removes die of fate from snowdin
2016-02-21 23:25:04 -06:00
5d5d2427f4
temp
2016-02-20 22:12:25 -08:00
18d24dc2b8
Fixed syntax
2016-02-20 00:54:04 -05:00
cc5f1b2179
Dice of fate is now reusable
2016-02-20 00:48:47 -05:00
cfcecba389
Merge pull request #15575 from phil235/ReviveFix1
...
Fixes mob revival
2016-02-17 20:42:10 -06:00
7e1efca13a
Created two new procs to handle reviving mobs more easily:
...
- can_be_revived(), used so we don't revive a mob who would immediately die again (lack of brain organ for carbons).
- fully_heal(), called by revive when we want to completely heal a mob before trying to ressuscitate it.
I gave some arguments to revive() so the proc can be used by more than just the admin healing code (ai revived by the AI fixer console, drone revived by another drone clicking it, strange reagent ressuscitating you, borg revived by restart circuitboard, changeling using his revive ability, etc)
This fixes borg revival not updating its vision correctly and not updating the diagnostic HUD. Same fix for changeling revival.
2016-02-16 23:27:08 +01:00
b46b11d75d
Makes wizard academy defender respect prefs
2016-02-14 23:03:22 -08:00
5854c87ce5
removes the letter c
...
dice -> die
2016-01-30 18:38:35 -08:00
a44f985566
Fixes dark wishgranter not killing faithless properly
2016-01-23 21:50:53 +01:00
8b13e0cfdd
i love map conflicts
2016-01-21 01:20:25 -05:00
af5f726089
lodesmapedits
2016-01-21 01:07:06 -05:00
1c34479376
Fix uplink code once and for all
...
Fixes #14733
2016-01-19 16:42:57 -06:00
b33c6f216d
Tidy tooltips; hide lock button from non-lockable uplinks
2016-01-18 14:27:34 -06:00
ff5d6292c8
tgui uplinks; repath uplinks
2016-01-18 14:22:00 -06:00
bff752a69a
Merge pull request #14513 from KorPhaeron/why
...
Removes teleport scroll from snowdin
2016-01-09 12:39:23 -03:00
7bafb9e1fd
Snowdin
2016-01-08 07:37:57 -06:00
5589ac7559
Revert "Merge pull request #12935 from AndrewJacksonThe2nd/objectives_rework"
...
This reverts commit 52a45b629219b43ba668
2016-01-07 23:15:35 -03:00
926fe760b6
Merge pull request #14286 from KorPhaeron/cheribucks_secured
...
Fixes away mission area names
2016-01-03 02:58:22 -03:00
1171d9d3fc
spellingishard
2016-01-02 00:59:53 -05:00
9466b33819
Fixes the other away missions
2016-01-01 23:49:42 -06:00
7ccce98b6e
CHERIBUCKS
2016-01-01 23:45:19 -06:00
2be090aee1
Merge branch 'master' of https://github.com/tgstation/-tg-station into geneticsishard
2016-01-01 15:03:45 -05:00
0d0210c951
Merge pull request #14197 from KorPhaeron/snowdin
...
Allows ghost spawners to implant the new mob
2016-01-01 16:31:53 -03:00
9c8a0cb0a5
Implant
2015-12-31 10:47:33 -06:00
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
1c1e892ddf
New Away Mission: Research Facility
2015-12-22 17:34:04 -05:00
55ebaf3bdb
snow stuff i guess
2015-12-15 17:33:34 -05:00
d07f300063
i did things
2015-12-15 16:46:24 -05:00
b3d992a832
conflict fix
2015-12-11 16:21:18 -05:00
d61d655076
oh my
2015-12-10 23:14:42 -05:00
f29336a4f8
Merge pull request #13470 from AnturK/academytwo
...
Academy Fixes & Upgrades.
2015-12-08 22:25:05 -06:00
f222dfe36e
mostly final changes, wowzers
2015-12-08 21:20:31 -05:00
c384aae4c3
more map edits, loot table balancing, bug fixes, also ATV VROOM VROOM
2015-12-08 00:43:53 -05:00
81f6c450e5
fianl stuff for now, testing!!!!!
2015-12-06 14:32:10 -05:00
1b09b3503d
Adds internals box to Academy Defender outfit
2015-12-06 14:16:09 +01:00
f8ab62e92e
finalization of the topside part, time to make dungeon designs woo
2015-12-06 01:13:17 -05:00
58a3f742c6
Spawnable hostile constructs, for away missions and adminfuckery.
2015-12-05 10:48:52 -05:00
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
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
AnturK
KazeEspada
tkdrg
Cheridan
AnturK
AndrewJacksonThe2nd
KorPhaeron
Buggy123
phil235
Shadowlight213
PKPenguin321
MMMiracles
Bjorn Neergaard
Nerd Lord