bfe1d5a599
Span classes.
2015-09-21 20:36:51 +09:30
22ef779f65
Cherrypicked xenophage-rewrite mechanics over.
2015-09-21 20:36:45 +09:30
7d7f0da2ca
Merge pull request #11156 from PsiOmegaDelta/150920-PunPunOnTheTable
...
Species tweaks
2015-09-21 19:08:53 +09:30
5243626724
Merge pull request #11157 from PsiOmegaDelta/150920-ThunderdomeExclamationmark
...
Map tweaks.
2015-09-21 11:49:47 +03:00
ced4ce268c
Adds Syndicate ID sprite
2015-09-20 21:11:49 +02:00
7d975aa36f
Map tweaks.
...
Adds a couple of decals to the Thunderdome.
Rotates sleepers/scanners on z-level 1 and 2. Had already done so for z-level 5. Fixes #11058 .
Full tile windows no longer appear to exist? Replaces the glass on the toxin test site with reinforced glass spawners.
2015-09-20 17:59:57 +02:00
d891fba1cc
Mob size tweaks.
...
Merges the use of the is_small and mob_size into one.
Changes the species size handling to set the mob size instead of being yet another separate var to check.
2015-09-20 17:12:07 +02:00
59c5807157
Active stunbatons now glow.
2015-09-19 21:12:19 +02:00
5863112d2d
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/clothing/spacesuits/rig/rig.dm
2015-09-15 20:31:59 +02:00
5c1b8380a4
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/weapons/tanks/jetpack.dm
code/game/objects/items/weapons/tanks/tanks.dm
2015-09-15 20:25:13 +02:00
6a61269edd
Merge pull request #11106 from Kelenius/jetpackFixes
...
Fixes for jetpacks and gas tanks
2015-09-15 15:06:58 +01:00
baebd62c26
Fixes tank examine()
2015-09-15 10:14:07 +03:00
db95743784
Merge pull request #11105 from PsiOmegaDelta/150914-ForcedWheelchair
...
Converts some loc = to forceMove()
2015-09-14 12:11:09 -04:00
3c4369823f
Fixes for jetpacks
...
Jetpacks now GC; CO2 jetpacks no longer pointlessly create a datum that
is already created in the parent; CO2 jetpacks can be properly examined;
removes text() and adds spans and \the.
2015-09-14 16:35:52 +03:00
bb5680193f
Converts some loc = to forceMove()
...
Fixes #11102 .
2015-09-14 11:13:15 +02:00
0d91ca0dfd
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
.travis.yml
2015-09-13 10:52:01 +02:00
830d2feb0d
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/structures/crates_lockers/closets/fireaxe.dm
code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
code/game/objects/structures/crates_lockers/largecrate.dm
2015-09-13 10:44:06 +02:00
0c21ef741e
Fixes #10988 .
...
Lights now update when objects are moved into crates and lockers.
Partial port of https://github.com/ParadiseSS13/Paradise/pull/1926 .
2015-09-12 20:43:24 +02:00
a7fa8cde49
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/clothing/spacesuits/void/merc.dm
code/modules/mob/living/living.dm
code/modules/mob/living/simple_animal/borer/borer_captive.dm
code/modules/mob/mob_grab_specials.dm
code/modules/reagents/reagent_containers/food/drinks/bottle.dm
html/changelogs/.all_changelog.yml
2015-09-11 08:54:03 +02:00
0b433eb90c
Code relocation.
2015-09-11 08:45:49 +02:00
f81ac77884
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/mining/abandonedcrates.dm
code/modules/mob/living/silicon/ai/ai.dm
2015-09-11 08:38:28 +02:00
ae5810d6ed
Fixes #10729
2015-09-10 13:50:24 -05:00
f69c723d40
Made flares a bit brighter
2015-09-09 20:42:40 -04:00
8e66d3b31a
Fixes IPCs being knocked unconscious when being hit in the head with a melee weapon
...
Replaces the hardcoded def_zones with a headcheck() proc to handle species who have "brains" are located in non-standard places.
2015-09-09 19:49:46 -04:00
cbd621ae41
Merge remote-tracking branch 'upstream/dev' into 150907-UplinkUses
2015-09-09 08:18:26 +02:00
6a956d0d0a
Uplink fixes.
...
Adds a default welcome message. Was lost in a game mode cleanup.
Traitors should now have telecrystals again. Also lost in the game mode cleanup.
Uplinks without correctly defined owners are now also printed in the round end summary.
2015-09-08 08:43:40 +02:00
23a3433e67
Moves nanomanager.close_uis(src) into datum/proc/Destroy() instead of /obj/Destroy() now that NanoUI supports datums.
2015-09-08 08:32:09 +02:00
94b4c483ba
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-09-08 08:22:37 +02:00
ec7e2491be
Updates "on merge" entries. Relocates code.
2015-09-08 08:03:14 +02:00
2f183e1cee
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/devices/uplink.dm
code/modules/nano/modules/human_appearance.dm
2015-09-08 07:58:25 +02:00
0e2f44e3ac
Admin logs bought uplink items.
2015-09-07 20:02:43 +02:00
88b95e1207
Fixes #7951
2015-09-07 14:40:23 +09:30
e27eda4c86
Merge pull request #10672 from mwerezak/frag-grenade
...
Adds fragmentation grenades
2015-09-07 14:12:27 +09:30
0c56bdd448
Merge pull request #10266 from PsiOmegaDelta/150722-TagPairs
...
Makes it possible to define multiple tag pairs for the Travis check.
2015-09-07 13:57:09 +09:30
fca95039bf
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev
...
Conflicts:
code/game/gamemodes/intercept_report.dm
code/game/gamemodes/traitor/traitor.dm
code/global.dm
code/modules/mob/inventory.dm
code/modules/mob/living/living.dm
html/changelogs/.all_changelog.yml
2015-09-07 11:31:19 +09:30
b9c01bf2f2
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
...
Conflicts:
code/game/objects/items/devices/uplink.dm
2015-09-07 11:17:06 +09:30
2563821832
Merge pull request #10972 from Zuhayr/resomi
...
Adds the Resomi.
2015-09-06 13:09:34 +03:00
cc960624b9
Fixes mercenary mode not listing bought items.
...
The mercenary leader now spawns with the uplink, as is set as its owner.
2015-09-06 10:43:09 +02:00
71d1853ede
Merge pull request #10993 from Zuhayr/species
...
Human subspecies.
2015-09-06 04:25:21 +03:00
2b2e27d380
Species flash cleanup.
2015-09-06 10:09:03 +09:30
348f678b81
Merge pull request #10997 from PsiOmegaDelta/150904-RadioAccess
...
Observers can now view radio settings, admins can alter them.
2015-09-05 16:59:42 +01:00
f8bf428e66
Merge pull request #10981 from comma/technoir
...
MrSnapwalk's Detective Uniform Resprite
2015-09-06 00:48:50 +09:30
6dc3b22432
Death to flashrev (compile fix)
2015-09-06 00:45:13 +09:30
808bbee90f
Added species vars for oxy/tox/rad/flash resistance.
2015-09-06 00:39:05 +09:30
95b12da391
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/__defines/gamemode.dm
code/game/antagonist/outsider/ert.dm
code/game/gamemodes/ninja/ninja.dm
2015-09-05 09:35:02 +02:00
69fde6af03
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/antagonist/alien/borer.dm
code/game/gamemodes/game_mode.dm
code/game/gamemodes/nuclear/nuclear.dm
code/game/gamemodes/traitor/traitor.dm
code/game/objects/items/robot/robot_parts.dm
code/setup.dm
2015-09-05 09:24:30 +02:00
8c743329df
Merge pull request #10955 from SkyMarshal/multi-z
...
Overhauls Multi-Z
2015-09-05 11:36:59 +09:30
23fb8d8b99
Antag system cleanup/fixes.
2015-09-04 18:28:05 +09:30
93a8a3a13f
Observers can now view radio settings, admins can alter them.
2015-09-04 10:07:41 +02:00
a41ce0bd93
Added the Resomi.
2015-09-04 08:57:03 +09:30
Zuhayr