Commit Graph

1363 Commits

Author SHA1 Message Date
Zuhayr
48cf00ca54 Merge with dev-freeze. 2015-06-21 20:45:47 +09:30
Zuhayr
d3bd63eec9 Refactor/tidies up latejoin antags/in-round antag spawning. 2015-06-21 19:33:49 +09:30
Zuhayr
ec5e05b9f1 Antagonist system refactor. Fixes #9495, #9290, #9521, #8800 and #9465. 2015-06-21 18:08:26 +09:30
Zuhayr
8664ecaabe Merge pull request #9837 from PsiOmegaDelta/150616-Uplink
Refactors antag uplink.
2015-06-21 01:22:56 +09:30
PsiOmegaDelta
1558bd5b75 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/objects/items/toys.dm
	code/modules/mob/living/carbon/brain/life.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/living_defense.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
	code/modules/reagents/reagent_containers.dm
	html/changelogs/.all_changelog.yml
2015-06-19 10:19:08 +02:00
PsiOmegaDelta
5b4dfdda9c Allows one to define list of random selection items.
Includes a default list with a couple of semi-randomly selected probabilities.
2015-06-17 15:04:06 +02:00
GinjaNinja32
078cfb2533 Merge pull request #9774 from mwerezak/chem-touch
Reagent splashing, mob fire
2015-06-17 10:05:11 +01:00
mwerezak
73333ac9c8 Moves metabolism to a holder subtype 2015-06-16 16:26:06 -04:00
PsiOmegaDelta
06a1ece4b8 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/ZAS/Controller.dm
	code/datums/mind.dm
	code/game/objects/items/devices/scanners.dm
	code/game/objects/items/stacks/sheets/glass.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/carbon/brain/posibrain.dm
	code/modules/mob/living/silicon/pai/pai.dm
2015-06-16 10:52:33 +02:00
PsiOmega
2760836b15 mob/living/Life() now handles breathing. 2015-06-13 14:43:56 +02:00
Zuhayr
f9134028b6 Fixes #9777 2015-06-10 23:14:34 +09:30
Chinsky
94406a6430 Merge pull request #9694 from PsiOmegaDelta/150605-Meteors
Ports /tg/'s meteors.
2015-06-08 14:17:57 +03:00
PsiOmega
26e5734e93 The AI screen now glows.
With the color depending on the chosen display screen.
2015-06-07 13:48:32 +02:00
PsiOmega
fc6de24042 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
	code/modules/materials/material_sheets.dm
	code/modules/organs/organ_icon.dm
	code/setup.dm
2015-06-07 10:51:41 +02:00
PsiOmegaDelta
6eea4ae7da Merge pull request #9712 from mwerezak/all-things-to-everyone
Chameleon items
2015-06-07 09:01:11 +02:00
mwerezak
3906989eac Mostly removes creation of throwaway objects from chameleon items
- Replaces the creation of throwaway items from New() with initial() calls for all chameleon items.
- Unfortunately throwaway items could not be removed when switch appearance, as initial() does not work very will with list vars.
- Makes chameleon item name cache lists global.
- Makes chameleon guns a subtype of energy guns, removes chameleon magazines.
- Moves chameleon.dm to clothing module root
- Items without icon or icon_state are no longer selectable as chameleon appearances.
- Chameleon verbs go in their own panel.
2015-06-06 18:19:23 -04:00
mwerezak
e7757de068 Moves key_name() to logging.dm 2015-06-06 17:01:31 -04:00
mwerezak
0725b0cc3e Moves admin attack log helpers to admin module, makes admin_attack_log more resilient against null arguments 2015-06-06 11:53:12 -04:00
PsiOmegaDelta
079b0af6b0 Adds spinning animation for meteors. 2015-06-05 15:55:39 +02:00
Chinsky
e5a8eb2dfc Actually renames 'going' var.
Axes speed of light and procs that used it (but were not used by anything). More maths too, and max stack amounts, not used anywhere.
Ticks back stuff that was unticked for faster compile, whoops.
2015-06-05 11:07:24 +03:00
Chinsky
ad0652d864 Moved some stuff from global.dm into defines files that fit the theme, some into files where they are used (and only there, much global). Axed some obsolete stuff (rip Debug var). 2015-06-04 22:51:15 +03:00
Chinsky
bf53304fec Splits setup.dm into berjillion of smaller files vaguely named thematically.
Also moved __HELPERS and _defines around so defines actually come first.
2015-06-04 21:51:58 +03:00
GinjaNinja32
3434826eaf Merge pull request #9490 from Zuhayr/xenoruins
Random map generator expansion.
2015-06-02 20:59:52 +01:00
Chinsky
58d9cb24a2 Merge pull request #9632 from PsiOmegaDelta/150602-Access
Generalizes access definitions.
2015-06-02 22:32:11 +03:00
Zuhayr
ebe62cefd8 Refactored random map generator system and added several terrain generators.
Created a global list to track base turfs for explosions/shuttle moves.
Remaps the asteroid to be a moonlet. Tidies up some references to 'asteroid', removes moonbase from the accessible z level list.
2015-06-03 04:36:19 +09:30
PsiOmegaDelta
88b80732e7 Generalizes access definitions.
Access description, type, and area/region (medical, security, etc.) is now defined in a datum, ensuring the id modification consoles will (should) never be missing entries.
2015-06-02 18:11:46 +02:00
Mloc
c1ce2f02b7 reorganize xgm into its own module
Signed-off-by: Mloc <colmohici@gmail.com>
2015-06-02 16:29:23 +01:00
PsiOmegaDelta
2c8c9df9d2 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	html/changelogs/.all_changelog.yml
2015-06-02 13:35:02 +02:00
Zuhayr
dadc434f4e Ported action button system from Paradise/tg 2015-06-02 17:17:13 +09:30
PsiOmegaDelta
e70faa20ee Merge pull request #9629 from GinjaNinja32/spawn
Spawn fixes
2015-06-02 08:05:54 +02:00
GinjaNinja32
5ebece6368 Spawn fixes
Fixes spawning a chem dispenser spamming the log with label settings
Fixes Spawn-Fruit and Spawn-Plant not being usable from hotbar
Fixes Spawn-Fruit and Spawn-Plant not producing admin logs (file only)
Allows spawning dispenser cartridges with different sizes and reagents
2015-06-02 02:24:32 +01:00
PsiOmega
3d49ad3927 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/jobs/job/job.dm
	code/game/jobs/job/silicon.dm
	code/game/objects/items/weapons/surgery_tools.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/carbon/human/species/species.dm
	code/modules/mob/living/carbon/human/species/station/station.dm
	code/modules/organs/organ_external.dm
	icons/obj/objects.dmi
2015-06-01 09:07:03 +02:00
Chinsky
ff592c751a Merge pull request #9483 from PsiOmegaDelta/150526-EndGameTweaks
End game tweaks
2015-05-31 23:55:08 +03:00
mwerezak
6b85a13de7 Merge remote-tracking branch 'upstream/dev' into chem-kinetics
Conflicts:
	code/modules/reagents/Chemistry-Recipes.dm
2015-05-30 17:25:57 -04:00
mwerezak
33487c76fa Implements reaction-over-time and reaction yield 2015-05-30 16:44:24 -04:00
Zuhayr
f9e99e1ee9 Fixes #9581 2015-05-31 03:34:29 +09:30
PsiOmega
d0232732d4 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/machinery/floodlight.dm
	code/game/objects/items/devices/suit_cooling.dm
	code/modules/organs/subtypes/diona.dm
	code/modules/paperwork/pen.dm
	code/modules/reagents/reagent_containers/hypospray.dm
	html/changelogs/.all_changelog.yml
2015-05-30 16:11:57 +02:00
PsiOmega
5e84bfa57c Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/modules/clothing/spacesuits/rig/suits/ert.dm
2015-05-30 15:59:54 +02:00
Zuhayr
15070d729d Dev-freeze into dev merge. 2015-05-30 00:31:12 +09:30
PsiOmega
4ce737d87d Server build date and revision.
Can now see the current compilation date and revision:
* In the Dream Daemon log output.
* By using the "Show Server Revision" client verb which also links you to the commit in question.
2015-05-29 08:26:31 +02:00
Atlantis
7981777c41 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into newmalf-merge 2015-05-28 20:16:12 +02:00
PsiOmega
e0177765c6 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	html/changelogs/.all_changelog.yml
2015-05-27 17:52:55 +02:00
PsiOmega
bcb1ea5413 Endgame tweaks.
Now instead calls the proper round-end proc when finishing the round, allowing admins to interrupt restart if desired.
None of the current end game variants currently use over/underlays, they are now content with coloring space.
On endgame start, the entire world is now updated in a spawn() instead, reducing crippling lag.
Adds support to designate APCs are critical, these are not drained during world end events.
Fixes a couple of potential runtime errors if no escape points have bee mapped in.
People in wheelchairs and mechas can now enter the world end rift.
Cult walls no longer cultify over and over, indefinitely.
2015-05-26 12:29:50 +02:00
PsiOmega
98c585615e Inactivity process tweaks.
Partially by request:
The inactive check process now respects client holder status and can be configured how long clients may remain inactive before being kicked.
2015-05-26 09:04:26 +02:00
PsiOmega
62185bc0a8 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-05-26 08:35:32 +02:00
Kelenius
ea12fc664f Merge branch 'dev' into ofResearchAndPrototypes
Conflicts:
	code/modules/mob/living/carbon/brain/posibrain.dm
2015-05-25 20:35:46 +03:00
Zuhayr
f32a8493c8 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into posibrains 2015-05-25 16:50:04 +09:30
Zuhayr
88b3019e6c Adds ghost click to posibrains.
Added ghost trap system used by plants and posibrains to get players. Added attack_ghost() to hydro trays and posibrains for the aforementioned.
Changelog.
Minor typo.
Topic fixes.
Minor fix.
2015-05-25 16:49:22 +09:30
Zuhayr
f0006ec6bf Removes redundant surgery for brain and eye repair, now covered by organ repair in general.
Attempted to limit regular surgery to non-robotic limbs and added surgical steps for robotic limbs.
Readded checks for smoking reagent transfer.
Fixes, oversights, tweaks with IPC.
Added some reagent bypassing for NO_BLOOD and some checks to various affect_touch() calls for NO_SCAN/IPC.
Added prosthetic-scanning functionality to cyborg analyzer.
Added prosthetic analysis to the robot analyzer.
Allowed people with internal cells to charge in robot chargers (IPCs).
2015-05-25 14:49:57 +09:30
Zuhayr
958494ae75 Removed IS_SYNTHETIC and REGENERATES_LIMBS flags.
Moved some organ code around, added icons and limbs for IPC, added IPC limb manufacturer.
Reimplementing checks in place of IS_SYNTHETIC.
Rebalancing EMP a bit for IPC.
2015-05-25 14:49:07 +09:30