Commit Graph

2011 Commits

Author SHA1 Message Date
Datraen
18d0c782fb Adds extended info to certain game modes missing extended info.
Conflicts:
	code/game/gamemodes/heist/heist.dm
2016-01-08 14:47:03 +01:00
Ccomp5950
7dc9b3487a Merge pull request #11739 from PsiOmegaDelta/151214-ObserveThis
Qdel() tweaking and a bonus
2016-01-01 23:58:29 -05:00
PsiOmegaDelta
a4545f8ded Scheduler, observation, and New() tweaks.
Corrects a number of places where New() did not call ..(), and implements similar changes to attempt to ensure New()/initialize() complete running before qdel() runs.
Cuts down on the number of created items during server start.
2015-12-27 17:44:53 +01:00
GinjaNinja32
2d5b677a62 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-12-25 03:51:40 +00:00
GinjaNinja32
7cca8416b3 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-12-25 03:41:33 +00:00
GinjaNinja32
34b8c99d52 backport fix for #10705 from dev
fix #10705
2015-12-25 00:56:16 +00:00
ccomp5950
ccda750ee1 AI Malf will no longer be able to spawn a non-antag AI
fixes #10554
2015-12-24 12:26:56 -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
1a8fc50f1e Removes suicide code. 2015-12-14 15:57:56 +01: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
mwerezak
3a738bac3f Adds click cooldown to attacking cult pylons 2015-12-06 00:24:08 -05:00
Chinsky
f9e56ddb18 Merge pull request #11349 from PsiOmegaDelta/151023-Wires
Converts the nuclear bomb to the new wire system.
2015-11-19 10:11:13 +03:00
PsiOmegaDelta
9e321ff6d5 Updates the nuclear bomb code and makes it utilize NanoUI, ported from Paradise. 2015-11-15 13:08:42 +01:00
PsiOmegaDelta
f5e565507d Merge pull request #11429 from atlantiscze/gridcheck
Updates gridcheck behavior
2015-11-10 08:41:54 +01:00
Atlantis
12330517a5 Minor update
- Severity now influences gridcheck duration.
- Adds changelog.
2015-11-07 18:05:47 +01:00
Atlantis
661b5968d9 Updates gridcheck behavior
- Gridcheck random event is updated. Core behavior remains the same, but mechanism it uses to achieve power outage is changed.
- Both SMESs and APCs have new variable which is set by gridcheck. This variable decrements by 1 every tick, and until it is back to zero the APC/SMES won't work.
- SMESs are disabled for 60-120 seconds (random for each SMES). APCs for 120-240 seconds.
- Both SMESs and APCs show error UI with timer counting down until the device restarts (begins working again).
- Both SMEss and APCs may be manually restarted, on per-device basis, by clicking restart button in the UI. This is useful if you urgently need one or two devices back online, for example, medical treatment facilities, etc. This immediately skips the X second timer and restores the device to working state, while keeping the original intention of this event - allowing antagonists to use lack of power to enter areas they don't normally have access to.
2015-11-07 17:11:25 +01:00
PsiOmegaDelta
b1fe5e3eab Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/antagonist/outsider/ert.dm
2015-11-06 17:50:34 +01:00
PsiOmegaDelta
e81f42840a Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/modules/mob/living/carbon/human/species/station/station.dm
2015-11-06 17:43:05 +01:00
PsiOmegaDelta
20eb505c69 Adds antag datum flag that is used to exlude the type from random selection.
Death Commando, Mercenary Commando (inherits from death commando), and the ERT antag types added to the exclude list. Fixes  #11416.
2015-11-05 08:48:05 +01:00
PsiOmegaDelta
7d4f51be8e Merge pull request #10287 from mwerezak/attack-cleanup2
Refactors item attack click and mob melee attack handling code
2015-10-25 08:43:47 +01:00
PsiOmegaDelta
0b9b8feb1e Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/gamemodes/malfunction/newmalf_ability_trees/tree_networking.dm
2015-10-21 10:38:57 +02:00
PsiOmegaDelta
db833735a8 Merge pull request #11340 from Baystation12/master
Dev-freeze.
2015-10-21 10:36:30 +02:00
Chinsky
e5cda9ad60 Merge pull request #11332 from PsiOmegaDelta/151019-BloodUponBlood
Limits the number of runes to one per turf.
2015-10-21 01:56:08 +03:00
PsiOmegaDelta
b92be265ee Limits the number of runes to one per turf.
Fixes #11248.
2015-10-19 12:49:32 +02:00
PsiOmegaDelta
03447fb609 Malf announcement type change.
Malf announcements are now command instead of priority announcements.
This will make them be logged by newscasters. Fixes #11325.
2015-10-17 16:01:49 +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
Chinsky
0c474bc5a5 Merge pull request #11281 from mwerezak/autoantag
Cleans up antag auto-spawning, adds checks for active antags
2015-10-15 19:16:13 +03:00
mwerezak
07881e7495 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into attack-cleanup2
Conflicts:
	code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm
2015-10-15 07:08:16 -04:00
PsiOmegaDelta
e41131368b Compilation fixes. 2015-10-14 08:43:38 +02:00
PsiOmegaDelta
3fd28dd361 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	html/changelogs/.all_changelog.yml
2015-10-14 08:41:38 +02:00
PsiOmegaDelta
3fd172ee63 Merge pull request #11294 from Baystation12/master
Dev-freeze
2015-10-14 08:40:03 +02:00
PsiOmegaDelta
a19829e968 Merge pull request #11289 from Kearel/secRemoveMaster
Pointed secret changes to master
2015-10-13 20:27:56 +02:00
Kearel
78956843a8 Pointed secret changes to master
New gamemodes on dev will still need to be changed.
2015-10-13 12:30:52 -05:00
HarpyEagle
c0dc32d60c If an antag could not be auto-spawned, the game rechecks in the minimum time. 2015-10-12 13:03:51 -04:00
HarpyEagle
241520f0bb Cleans up autospawn, now uses existing code for selecting and choosing
candidates. Adds more debug messages, and removes unused code.
2015-10-12 13:03:50 -04:00
HarpyEagle
c7afded12d Cleans up calamity shuffle, makes sure antag types are selected in a random order for other game modes. 2015-10-11 12:18:01 -04:00
HarpyEagle
d715e0645f Removes unused latejoin template list 2015-10-11 12:02:04 -04:00
HarpyEagle
43d5f2e3bd Ensures leftover candidates and pending antags are cleared after finalizing 2015-10-11 11:39:26 -04:00
HarpyEagle
dec0629fae Renames latespawn() to be less confusing 2015-10-11 11:26:24 -04:00
PsiOmegaDelta
8341620be4 Merge pull request #11246 from Kelenius/blobPlzGo
Updates blob
2015-10-08 07:58:15 +02: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
HarpyEagle
7f066065d3 Merge remote-tracking branch 'upstream/dev' into attack-cleanup2
Conflicts:
	code/modules/mob/living/simple_animal/friendly/spiderbot.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
2015-10-05 19:20:33 -04:00
Kelenius
83adba88d4 Updates blob
Remains of player blob axed.
blob_act() axed. Blob now has an arbitary set of things it can attack.
It will flow over everything else. Blob has an awful tendency to destroy
non-craftables.
Will test more tomorrow.
Blob will now attack mechs.
Fixes #8106.
Fixes #10705.
2015-10-05 18:10:16 +03:00
Kelenius
f3effa8df7 Basic encryption hack popup only shows suitable APCs 2015-10-05 11:40:19 +03:00
PsiOmegaDelta
e74d586c99 Merge pull request #11186 from Baystation12/dev-freeze
Dev
2015-09-24 08:26:42 +02:00
PsiOmegaDelta
61a4d3b7af Merge pull request #11185 from Baystation12/master
Dev-freeze
2015-09-24 08:17:45 +02:00
Daranz
ebaa452c4c Fix spelling: 'its' in place of 'it's' 2015-09-21 15:37:22 +02:00
PsiOmegaDelta
d65ebf8b90 Meteor events are now direction biased.
When a meteor event triggers it now selects a main edge to arrive from, with a 20% probability to come from either neighboring edge. Will never arrive from the opposite edge.
The meteor event end time is now made more useful, and is based on a longest delay between meteor waves scenario.
The meteor event now supports multiple station Z-levels.
Removes the meteor sounds, as they can rarely be heard over the explosions anyway.
2015-09-18 21:45:15 +02:00