Commit Graph

111 Commits

Author SHA1 Message Date
Mloc
f6c1e37d2a add a little ID to uniquely identify rounds in logs and to players
Signed-off-by: Mloc <colmohici@gmail.com>
2016-01-21 21:19:16 +00:00
PsiOmegaDelta
5524739e70 Tweaks the datum pooling. 2016-01-08 16:03:54 +01:00
PsiOmegaDelta
875d8455f0 Pooling Update from TG
Ports https://github.com/tgstation/-tg-station/pull/13279.
2016-01-08 14:47:13 +01:00
ccomp5950
6633fb4e08 Unit Tests
Adds an example, edits Travis to run them.
2015-12-31 11:18:15 -05:00
ccomp5950
6736fb54e7 Merge branch '_base-turf' of https://github.com/mwerezak/Baystation12 into dev
Conflicts:
	code/game/area/Space Station 13 areas.dm
2015-12-17 20:25:36 -05:00
PsiOmegaDelta
b2720a8c6c Fixes sparks causing runtimes on pooling. 2015-12-09 20:41:55 +01:00
Chinsky
60e785da97 Merge pull request #11458 from PsiOmegaDelta/151117-MultitoolPower
Multitool Upgrade
2015-12-09 21:34:12 +03:00
GinjaNinja32
1921c35231 fix issues with indented absolute path definitions 2015-12-09 14:12:54 +00:00
Jon
c9b7a8ece3 Updates all get_base_turf usages to get_base_turf_by_area.
This means that instead of the base turf being defined by the z-level, it's now defined by area and defaulted by z-level.

Updates all "shuttle" and "solar" areas to have a base_turf of space.
Updates docking arms 1, 2, and 3 on the main asteroid level to have a base_turf of space.

Other z-levels may still need updating.

This change means that all actions which destroy or dismantle a tile - for example bombs, a singularity, a shuttle leaving, or deconstruction - now leave these new areas as space not asteroid. Future mapping efforts may need to take this into account.

Conflicts:
	code/game/area/Space Station 13 areas.dm
2015-12-06 14:01:21 -05:00
Jon
edb50b3504 Allows you to define a base turf for an area which overrides the z-level's base turf in unsorted.dm.
It will first check to see if the turf is set, and if not it will still use the z-level default.
This means we can mark areas as having a base of space to override the z-level base of asteroid that we're using.
As a result, we can ensure the bombs, shuttles moving, etc. leave behind an space turf by defining shuttles, solars/"external" areas as using space as a base.
Areas will need to be updated to check with base_turf = /turf/space and references to the old get_base_turf proc updated so all calls (bombs, Nar'Sie, deconstruction, etc.) have the correct effect, but it's tired and I want to commit this now so I'm committed to finishing it tomorrow.
2015-12-06 13:18:46 -05:00
PsiOmegaDelta
c30a518221 Merge remote-tracking branch 'upstream/dev' into 151117-MultitoolPower
Conflicts:
	code/modules/mob/living/silicon/ai/ai.dm
2015-12-02 09:18:07 +01:00
PsiOmegaDelta
eb3a266444 Merge pull request #11507 from Zuhayr/dev
Adds a possession system for ghost mousedrop(). Currently allows for control of mice, drones and use of drone fabricators.
2015-11-30 16:55:14 +01:00
PsiOmegaDelta
4e89045aab Merge pull request #11451 from Loganbacca/wireless
Wireless controller for machinery connections
2015-11-27 07:59:59 +01:00
Loganbacca
3a14650dc1 Wireless controller cleanup
Changed back to count based spawn_sync failsafe
Moved toggle buttons to be a subtype
Purged unfinished wireless tool (code and icon)
2015-11-25 21:14:38 +13:00
Loganbacca
d7602a2cd5 Wireless and spawn_sync tweaks
Modified spawn_sync to include the spawning code, thus simplifying it's usage.
Modified spawn_sync to use actual time for failsafes.
A couple of sensibility tweaks for the wireless controller.
Cleaned up devices.dm to use new spawn_sync code.
Suggestions courtesy of @mwerezak

Added a changelog
2015-11-24 23:00:58 +13:00
GinjaNinja32
98c8729bb3 Merge pull request #11265 from Karolis2011/camera_fix
General camera fixes.
2015-11-23 09:29:02 +00:00
Loganbacca
da7a4a78d8 Documentation and stuff
Documentation, documentation, documentation.
Safety checks.
Reshuffled some code.
Modified wifi senders and receivers to both use var/id, instead of two different vars for basically the same purpose.
2015-11-23 21:46:29 +13:00
PsiOmegaDelta
50fb4a8de7 Merge remote-tracking branch 'upstream/dev' into 151117-MultitoolPower
Conflicts:
	code/game/objects/items/devices/multitool.dm
2015-11-23 08:57:12 +01:00
Zuhayr
e5ec6c761b Adds a possession system for ghost mousedrop(). Currently allows for control of mice, drones and use of drone fabricators. 2015-11-23 05:52:33 +10:30
Loganbacca
e7ec675bef Spawn sync helper
See spawn_sync.dm for documentations
2015-11-22 22:32:52 +13:00
Loganbacca
821987c31b Pipe photo fix 2015-11-22 16:40:53 +13:00
Bjorn Neergaard
6b742bd44f Add /tg/-style attack animations
Thanks to @GinjaNinja32 for some style tweaks
2015-11-20 15:45:16 -05:00
Chinsky
a287e47c28 Merge pull request #11364 from PsiOmegaDelta/151024-Btime
Scheduler now uses btime, and other improvements.
2015-11-19 10:14:03 +03:00
PsiOmegaDelta
47ece50813 Allows the AI to utilize its multitool where applicable. 2015-11-18 11:01:08 +01:00
PsiOmegaDelta
e40246e9df Character setup tweaks.
Adds client verb to access the character setup screen from anywhere.
Moves name validation to species level, making it possible for IPCs to have numbers in their name.
Adds gender validation, also adds support to add neuter/plural genders in the future if ever desired.
Now sanitizes preferences before applying them to a mob.
Fixes #11433.
2015-11-11 13:50:22 +01:00
PsiOmegaDelta
9d6c99aaf3 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	.travis.yml
	code/modules/mob/living/carbon/breathe.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
	html/changelogs/.all_changelog.yml
2015-10-27 13:08:33 +01:00
PsiOmegaDelta
3db2c4fb49 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
2015-10-27 12:38:28 +01:00
PsiOmegaDelta
88d85c16fa Scheduler now uses btime.
Partial port of https://github.com/ParadiseSS13/Paradise/pull/1540.
2015-10-24 12:53:04 +02:00
PsiOmegaDelta
299ad9580c Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/admin/admin.dm
	code/modules/admin/topic.dm
2015-10-16 13:02:59 +02:00
PsiOmegaDelta
fc4c1d6af7 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/objects/items/weapons/storage/boxes.dm
	code/game/objects/items/weapons/storage/storage.dm
2015-10-16 11:04:43 +02:00
PsiOmegaDelta
3b5990121f Blobs locations are now more random.
Blobs now randomly pick a random turf without obstructions in maintenance, instead of from a pre-determined list of locations.
Blobs also now log their spawn location, which admins can use to jump to it.

Space vines and nuclear discs have been updated to use the same mechanics.
2015-10-13 18:49:55 +02:00
Karolis2011
df110f28a5 Fixes AI camera not working and moves can_capture_turf to the mob. 2015-10-10 18:43:26 +03:00
Karolis2011
83158d3d16 More tolarable 3 way manifold rendering fix. 2015-10-10 16:58:01 +03:00
Karolis2011
414c160b9f Removed code copy paste and fixed light not showing up on images. 2015-10-10 02:58:50 +03:00
PsiOmegaDelta
aaba2c5c8c Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/mob/living/silicon/robot/robot_modules.dm
2015-10-07 08:14:30 +02:00
PsiOmegaDelta
c5d8fbfd57 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/antagonist/alien/borer.dm
	code/modules/mob/living/living_defense.dm
2015-10-07 08:07:23 +02:00
PsiOmega
709840f848 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/admin/DB ban/functions.dm
2015-09-26 08:48:37 +02:00
PsiOmega
145d8d91ef Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/_helpers/unsorted.dm
2015-09-26 08:43:06 +02:00
PsiOmega
98175214d6 Attempts to improve mob in view acquirement.
Creates a central proc that can (and will be) re-used.
This proc is hopefully more expandable by utilizing proc overrides.
It is now 1 instead of 3 loops (made even worse by the fact that each individual loop would re-acquire targets in view).
2015-09-13 14:32:49 +02:00
PsiOmega
0d91ca0dfd Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	.travis.yml
2015-09-13 10:52:01 +02:00
PsiOmega
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
PsiOmegaDelta
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
PsiOmegaDelta
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
Zuhayr
e27eda4c86 Merge pull request #10672 from mwerezak/frag-grenade
Adds fragmentation grenades
2015-09-07 14:12:27 +09:30
GinjaNinja32
a1b9dc2b4a Resomi language tweaks, fixes every species' names being generated in Galcom 2015-09-06 22:10:39 +01:00
Zuhayr
63cb207eb8 Merge pull request #10890 from PsiOmegaDelta/150826-AltLangKeys
Languages now use alternative prefix keys.
2015-09-06 17:20:51 +09:30
PsiOmega
1b23f794c5 Merge remote-tracking branch 'upstream/dev' into 150822-Intercoms 2015-09-02 10:54:04 +02:00
PsiOmega
c730a67d79 Makes it possible to select department channels on intercoms. 2015-09-02 10:38:16 +02:00
GinjaNinja32
09fd54e12c Merge pull request #10959 from PsiOmegaDelta/150831-GetThatTurf
Ports LummoxJr's get_turf()
2015-08-31 20:57:02 +01:00
PsiOmega
af86b8a935 Ports LummoxJr's get_turf() 2015-08-31 08:45:20 +02:00